X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.planetlab%2Fbootstrapfs.post;h=24371fc976c557307944072bdea24c519de9f1bd;hb=bbbf2d6ba77051088f4440f52944e8a308ec96ba;hp=1de09d7a4f6c86187570cf40a5c5b0f977ba64ef;hpb=2caf6539083f32b51e92e7a984cd9ffe8d5d6805;p=build.git

diff --git a/config.planetlab/bootstrapfs.post b/config.planetlab/bootstrapfs.post
index 1de09d7a..24371fc9 100644
--- a/config.planetlab/bootstrapfs.post
+++ b/config.planetlab/bootstrapfs.post
@@ -7,57 +7,48 @@ if [ -z "${vdir}" ] ; then
 	exit
 fi
 
+# Cleanup yum config entirely, waiting for the config files to populate this
+rm -rf ${vdir}/etc/yum.conf ${vdir}/etc/yum.repos.d
+
+# NOTE: we're enabling util-vserver to allow it to help shutdown all slices
+# before rebooting.  This has been problematic in the past.
+# Thierry : I'm enabling network since, for some reason, it ends up turned off on fedora9
+for service in network util-vserver; do
+    chroot ${vdir} /sbin/chkconfig $service on
+done
+
 # Remove unneeded services
-for service in util-vserver vprocunhide vservers-default; do
-    chroot ${vdir} /sbin/chkconfig $service off
+# turn off firstboot if present, might cause the node to hang
+for service in vprocunhide vservers-default firstboot; do
+    chroot ${vdir} /sbin/chkconfig $service off || :
 done
 
 # Disable splaying of cron.
 echo > ${vdir}/etc/sysconfig/crontab
 
-# sss
-# update /etc/sysconfig/network-scripts/ifup
-#  #if ! arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${IPADDR} ; then
-      #echo $"Error, some other host already uses address ${IPADDR}."
-      #exit 1
-   #fi
-
 # Add site_admin account
 chroot ${vdir} /usr/sbin/useradd -p "" -u 502 -m site_admin
 
-( cat <<EOF ) | patch -d ${vdir}/etc/init.d/
---- halt        2007-10-08 19:18:54.000000000 +0000
-+++ halt2       2008-05-07 17:52:42.000000000 +0000
-@@ -65,8 +65,10 @@
- # Kill all processes.
- [ "\${BASH+bash}" = bash ] && enable kill
-
-+action $"Sending all VServers the TERM signal..."  ls -d /proc/virtual/[0-9]* | awk -F '/' '{print \$4}' | xargs -I{} /usr/sbin/vkill -s 15 --xid {} -- 0
- action $"Sending all processes the TERM signal..." /sbin/killall5 -15
- sleep 2
-+action $"Sending all VServers the KILL signal..."  ls -d /proc/virtual/[0-9]* | awk -F '/' '{print \$4}' | xargs -I{} /usr/sbin/vkill -s 9 --xid {} -- 0
- action $"Sending all processes the KILL signal..."  /sbin/killall5 -9
-
- # Write to wtmp file before unmounting /var
-EOF
-
-
-( cat <<EOF ) | patch -d ${vdir}/etc/sysconfig/network-scripts/
---- ifup-eth    2008-05-30 13:20:17.382681663 +0000
-+++ ifup-eth-fixed      2008-06-03 16:41:25.284200756 +0000
-@@ -214,10 +214,10 @@
-         /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS
+# NOTE:  This is added to relieve one site's Cisco router configuration that
+# fails to recognize the host once the arping is sent out.
+# NOTE: this is pretty fragile, and fails on fedora 10 that as of today (oct. 20 2009) 
+# has initscripts-8.86.3-1.i386 which reads almost identical but with /sbin/arping instead
+cat <<\EOF | patch -d ${vdir}/etc/sysconfig/network-scripts/
+--- ifup-eth	2008-07-08 13:19:49.000000000 -0400
++++ ifup-eth-orig	2008-07-08 13:20:02.000000000 -0400
+@@ -263,10 +263,10 @@
      fi
-
--    if ! arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${IPADDR} ; then
--       echo $"Error, some other host already uses address ${IPADDR}."
--       exit 1
--    fi
-+#    if ! arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${IPADDR} ; then
-+#      echo $"Error, some other host already uses address ${IPADDR}."
-+#      exit 1
-+#    fi
-
-     if [ "${DEVICE}" = "lo" ]; then
-        SCOPE="scope host"
+     
+     if ! LC_ALL=C ip addr ls ${REALDEVICE} | LC_ALL=C grep -q "${IPADDR}/${PREFIX}" ; then
+-	 if ! arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${IPADDR} ; then
+-	    echo $"Error, some other host already uses address ${IPADDR}."
+-	    exit 1
+-	 fi
++	 #if ! arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${IPADDR} ; then
++	 #   echo $"Error, some other host already uses address ${IPADDR}."
++	 #   exit 1
++	 #fi
+ 	 if ! ip addr add ${IPADDR}/${PREFIX} \
+ 	    brd ${BROADCAST:-+} dev ${REALDEVICE} ${SCOPE} label ${DEVICE}; then
+ 	    echo $"Error adding address ${IPADDR} for ${DEVICE}."
 EOF