Changeset 9c166cf

Timestamp:

Nov 5, 2008 1:38:10 AM (16 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:

2dafa0c

Parents:

2c6128f

Message:

Support for this as a real fedkit. Loads using fedd and establishes connectivity

Location:

fedkit

Files:

• Makefile (modified) (2 diffs)
• federate.sh (modified) (6 diffs)
• make_hosts (modified) (2 diffs)

fedkit/Makefile

@@ -1 @@
-BINARIES=fed_bootstrap federate.sh smbmount.FreeBSD.pl smbmount.Linux.pl \
+BINARIES=federate.sh smbmount.FreeBSD.pl smbmount.Linux.pl \
          make_hosts fed-tun.pl fed-tun.ucb.pl fed_evrepeater
 PATCHES=rc.accounts.patch
 
-fedkit.tgz:
+fedkit.tgz:     ${BINARIES} ${PATCHES}
         mkdir -p /tmp/fedkit/local/federation/bin
         mkdir -p /tmp/fedkit/local/federation/etc
@@ -9 +9 @@
         cp ${PATCHES} /tmp/fedkit/local/federation/etc
         tar czf fedkit.tgz -C /tmp/fedkit local
-        rm -rf /tmp/fedkit$$
+        rm -rf /tmp/fedkit
+
+clean:
+        rm -f fedkit.tgz

fedkit/federate.sh

@@ -58 +58 @@
 PROJECT=`$EMUDIR/tmcc -b status | $PERL -ne '/ALLOCATED=([^\/]+)\/([^\s]+)/ && print "$1\n";'`
 EXP=`$EMUDIR/tmcc -b status | $PERL -ne '/ALLOCATED=([^\/]+)\/([^\s]+)/ && print "$2\n";'`
-SCRIPTDIR="/proj/$PROJECT/exp/$EXP/tmp"
+CONFIGDIR="/proj/$PROJECT/exp/$EXP/tmp"
+SCRIPTDIR="/usr/local/federation/bin"
 
 # Die if Scripts are not where they should be.  NB, this is checked by the
 # bootstrapper, too, so a failure here is unlikely.
-if [ -z "$SCRIPTDIR" ] ; then
-    echo "Can't find federation scripts.  Tmcc status says:"
+if [ -z "$CONFIGDIR" ] ; then
+    echo "Can't find federation configs.  Tmcc status says:"
     $EMUDIR/tmcc -b status
     exit 1;
@@ -70 +71 @@
 # 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`
-SMBPROJECT=`$PERL -ne '/ProjectName:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
+GATEWAY=`$PERL -ne '/ControlGateway:\s+(.*)/i && print "$1\n";' $CONFIGDIR/client.conf`
+SHARE=`$PERL -ne '/SMBShare:\s+(.*)/i && print "$1\n";' $CONFIGDIR/client.conf`
+SMBUSER=`$PERL -ne '/ProjectUser:\s+(.*)/i && print "$1\n";' $CONFIGDIR/client.conf`
+SMBPROJECT=`$PERL -ne '/ProjectName:\s+(.*)/i && print "$1\n";' $CONFIGDIR/client.conf`
 
 # XXX: modified seer daemon to read a config file.  Not in the tarfile yet.  If
@@ -88 +89 @@
 # Copy the seer.conf to the local /tmp if there is one
 
-if [ -e $SCRIPTDIR/seer.conf ]; then
-        /bin/cp $SCRIPTDIR/seer.conf /tmp
+if [ -e $CONFIGDIR/seer.conf ]; then
+        /bin/cp $CONFIGDIR/seer.conf /tmp
 fi
 
@@ -97 +98 @@
 # localhost entry that's aliased to this host's name. 
 grep 127\\.0\\.0\\.1 /etc/hosts > /tmp/hosts
-cat "$SCRIPTDIR/hosts" >> /tmp/hosts
+cat "$CONFIGDIR/hosts" >> /tmp/hosts
 # If there's no node in this experiment called control, fake one so
 # that SEER events get through (if SEER's in use)
-if ! grep -q control $SCRIPTDIR/hosts; then
+if ! grep -q control $CONFIGDIR/hosts; then
         echo "$GWIP     control.$EXP.$PROJECT" >> /tmp/hosts
 fi
@@ -110 +111 @@
 # 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
+
+if [ -e /usr/local/federation/etc/rc.accounts.patch ]; then
+        cd "$EMUDIR/rc"
+        patch -f < /usr/local/federation/etc/rc.accounts.patch
+        cd /tmp
+fi
 
 #
@@ -167 +171 @@
 #
 echo "Mounting via SMB."
-$PERL "/tmp/$SMBMOUNT" $SHARE $GATEWAY $SMBUSER $SMBPROJECT
+$PERL "/usr/local/federation/bin/$SMBMOUNT" $SHARE $GATEWAY $SMBUSER $SMBPROJECT
 
 echo "Restoring old bossnode"

fedkit/make_hosts

@@ -17 +17 @@
 PROJECT=`$EMUDIR/tmcc -b status | $PERL -ne '/ALLOCATED=([^\/]+)\/([^\s]+)/ && print "$1\n";'`
 EXP=`$EMUDIR/tmcc -b status | $PERL -ne '/ALLOCATED=([^\/]+)\/([^\s]+)/ && print "$2\n";'`
-SCRIPTDIR="/proj/$PROJECT/exp/$EXP/tmp"
+CONFIGDIR="/proj/$PROJECT/exp/$EXP/tmp"
+SCRIPTDIR="/usr/local/federation/bin"
 
 # Very simple script to copy the global hosts file over the local one
@@ -50 +51 @@
 # Copy the seer.conf to the local /tmp if there is one
 
-if [ -e $SCRIPTDIR/seer.conf ]; then
-        /bin/cp $SCRIPTDIR/seer.conf /tmp
+if [ -e $CONFIGDIR/seer.conf ]; then
+        /bin/cp $CONFIGDIR/seer.conf /tmp
 fi