Changeset f3691ff

Timestamp:

May 17, 2008 5:09:31 PM (17 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

387408b

Parents:

2396559e

Message:

checkpoint includes some ucb and some FC6 code

Location:

fedkit

Files:

• fed-tun.ucb.pl (added)
• fed_bootstrap (modified) (1 diff)
• federate.sh (modified) (5 diffs)
• rc.accounts.patch (added)
• smbmount.FreeBSD.pl (moved) (moved from fedkit/smbmount.pl) (1 diff)
• smbmount.Linux.pl (added)
• splitter.pl (modified) (4 diffs)

fedkit/fed_bootstrap

@@ -22 +22 @@
 
 # The copy
-for f in federate.sh smbmount.pl; do 
+for f in federate.sh smbmount*.pl *.patch; do 
         cp $SCRIPTDIR/$f /tmp && chmod 755 /tmp/$f
 done

fedkit/federate.sh

@@ -21 +21 @@
 # automount process.
 RCACCT="rc.accounts"
-SMBMOUNT="smbmount.pl"
+SMBMOUNT="smbmount.`uname`.pl"
+
+# Find the right version of pkill.  For killing.
+if [ -x "/usr/bin/pkill" ] ; then 
+        PKILL="/usr/bin/pkill"
+else
+        if [ -x "/bin/pkill" ] ; then 
+                PKILL="/bin/pkill"
+        else
+                PKILL="echo"
+        fi
+fi
+
+if [ -x "/usr/bin/perl" ]; then
+    PERL="/usr/bin/perl"
+else
+    if [ -x "/usr/local/bin/perl" ]; then
+        PERL="/usr/local/bin/perl"
+    else
+        # Wing it...
+        PERL="perl"
+    fi
+fi
 
 # Find somewhere safe to stop
@@ -34 +56 @@
 
 # Find this experiment's stashed scripts.  (Perl for advanced parsing)
-SCRIPTDIR=`$EMUDIR/tmcc -b status | perl -ne '/ALLOCATED=([^\/]+)\/([^\s]+)/ && print "/proj/$1/exp/$2/tmp\n";'`
+SCRIPTDIR=`$EMUDIR/tmcc -b status | $PERL -ne '/ALLOCATED=([^\/]+)\/([^\s]+)/ && print "/proj/$1/exp/$2/tmp\n";'`
 
 # Die if Scripts are not where they should be.  NB, this is checked by the
@@ -53 +75 @@
 # Get our gateway, share, and mount user from the configuration file.
 # There's probably a way to get all three at once, but this works.
-GATEWAY=`perl -ne '/ControlGateway:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
-SHARE=`perl -ne '/SMBShare:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
-SMBUSER=`perl -ne '/ProjectUser:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
+GATEWAY=`$PERL -ne '/ControlGateway:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
+SHARE=`$PERL -ne '/SMBShare:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
+SMBUSER=`$PERL -ne '/ProjectUser:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
+SMBPROJECT=`$PERL -ne '/ProjectName:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
+
+# XXX:
+# The standard emulab rc.accounts script won't replace existing user accounts
+# with our new ones, so we have to patch it to do so.  This is obviously pretty
+# fragile and needs to change.  To make matters worse, our FBSD62-SMB images
+# contain the patched rc.accounts, so this patching step will fail there.
+cd "$EMUDIR/rc"
+patch -f < /tmp/rc.accounts.patch
+cd /tmp
 
 #
@@ -80 +112 @@
 
 #
-# Unmount stuff before messing with accounts
+# Unmount stuff before messing with accounts 
+# Linux doesn't believe in -A so run umount without it if the first fails
 #
-umount -A -f -t nfs,smbfs
 
+umount -A -f -t nfs,smbfs,cifs  || umount -a -f -t nfs,smbfs,cifs
 
 #
 # Setup new accounts
 #
+
+# Clear the cache, just in case:
+rm -f /var/emulab/boot/tmcc/accounts
+
 $RCDIR/rc.accounts reconfig
 
 #
-# Call the smbmount perl script, this invokes the automounter to mount teh
+# Call the smbmount perl script, this invokes the automounter to mount the
 # needed smb filesystems.
 #
 echo "Mounting via SMB."
-"/tmp/$SMBMOUNT" $SHARE $GATEWAY $SMBUSER 
+$PERL "/tmp/$SMBMOUNT" $SHARE $GATEWAY $SMBUSER $SMBPROJECT
 
 echo "Restoring old bossnode"
@@ -108 +145 @@
 # partial topology -e.g. failed or partial bridging - that might have confused
 # the router should be gone.
-/bin/pkill ospf
-/bin/pkill gated
+$PKILL ospf
+$PKILL gated
+# XXX Danger, hack ahead.  Apparently our FC6-SMB image and emulab disagree
+# about where gated lives.  This will alias it.
+if [ ! -x /usr/sbin/gated ] ; then 
+        if [ -x /sbin/gated ] ; then
+                ln /sbin/gated /usr/sbin/gated
+        fi
+fi
 /usr/local/etc/emulab/rc/rc.route boot
 

fedkit/smbmount.FreeBSD.pl

@@ -1 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 #############################################################################
 # smbmounts.pl: Setup Automounter to mount via SMB for federated experiments
-# $Id: smbmount.pl,v 1.4 2007-09-27 20:53:16 jhickey Exp $
+# $Id: smbmount.FreeBSD.pl,v 1.1 2008-05-18 00:09:31 faber Exp $
 #
 

fedkit/splitter.pl

@@ -9 +9 @@
 use File::Copy;
 
-my @scripts = ("fed_bootstrap", "federate.sh", "smbmount.pl", 
-    "make_hosts", "fed-tun.pl", "fed_evrepeater" );
+my @scripts = ("fed_bootstrap", "federate.sh", "smbmount.FreeBSD.pl", 
+    "smbmount.Linux.pl", "make_hosts", "fed-tun.pl", "fed_evrepeater",
+    "rc.accounts.patch");
 my $local_script_dir = ".";
 my($pid, $gid);                 # Process and group IDs for calling parse.tcl
@@ -492 +493 @@
 $project_user = $opts{'smbuser'} ||     # User to mount project dirs as
     die "Must give an SMB user\n";
-$auth_proj = $opts{'P'} || die "Must give an authentication project (-P)\n";
+$auth_proj = $opts{'P'};
 
 # tcl program to split experiments (changed during devel)
@@ -574 +575 @@
         # If this testbed has not had its access parameters read from fedd, try
         # to read them, if we have a way to talk to fedd
-        unless ($tbparams->{$tb}->{'access'} && $fedd_client) { 
+        unless ($tbparams->{$tb}->{'access'} || !$fedd_client) { 
             my $access_pipe = new IO::Pipe || 
                 die "Can't open pipe to fedd:$!\n";
+            my $proj = $auth_proj ? " -p $auth_proj " : "";
 
             print("Checking access to $tb using " . $tbparams->{$tb}->{'uri'}
@@ -583 +585 @@
             my $cmd = "$fedd_client -t " . 
                 $tbparams->{$tb}->{'uri'} .  " -T $ENV{HOME}/cacert.pem ".
-                "-l $tb -p $auth_proj | /usr/bin/tee fedd.$tb ";
+                "-l $tb $proj | /usr/bin/tee fedd.$tb ";
             print "$cmd\n" if $verbose;