Changeset 7add1a3 for fedkit

Timestamp:

Aug 20, 2008 4:53:45 PM (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:

d0ae12d

Parents:

6679c122

Message:

stop the routing daemon before we restart it

File:

• fedkit/make_hosts (modified) (2 diffs)

fedkit/make_hosts

@@ -8 +8 @@
 cp /tmp/hosts /etc/hosts && rm /tmp/hosts
 
-
-# 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
+# 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
-/usr/local/etc/emulab/rc/rc.route 
 
 # SEER feels pain and confusion if times are wrong.  This lays a big lick on
@@ -34 +35 @@
                 ;;
 esac
+# I remain unclear why ospfd seems screwed up after the resetting of accounts
+# and mounts.  This seems to fix it, but it's not very satisfying.  At this
+# point the federated topology is complete, so any problems with routing in a
+# partial topology -e.g. failed or partial bridging - that might have confused
+# the router should be gone.
+$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 
+
 
 # Execute any command passed in as a startcmd.  This basically daisy chains the