From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Wed, 18 Jun 2008 19:46:19 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 4.2-rc21~41
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2caf6539083f32b51e92e7a984cd9ffe8d5d6805;p=build.git

---

diff --git a/config.planetlab/bootstrapfs.post b/config.planetlab/bootstrapfs.post
index d35618c2..1de09d7a 100644
--- a/config.planetlab/bootstrapfs.post
+++ b/config.planetlab/bootstrapfs.post
@@ -15,6 +15,13 @@ 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
 
@@ -33,3 +40,24 @@ chroot ${vdir} /usr/sbin/useradd -p "" -u 502 -m site_admin
 
  # 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
+     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"
+EOF