X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.mlab%2Fnodeimage.post;h=a501e6368594e157d6d0cef87aa5648adec853fc;hb=HEAD;hp=79d54fe3c91fd058c058a799ae26009f02f1bd1b;hpb=dd88fed790f12c1ca09f356b25bcc7837f8d5333;p=build.git

diff --git a/config.mlab/nodeimage.post b/config.mlab/nodeimage.post
index 79d54fe3..a501e636 100644
--- a/config.mlab/nodeimage.post
+++ b/config.mlab/nodeimage.post
@@ -65,28 +65,23 @@ cat <<EOF > ${vdir}/etc/logrotate.d/btmp
 }
 EOF
 
-# 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
-# NOTE: this might work with fedora8 and centos5
-# the other distros will probably just fail to add this patch
-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 ! 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}."
+# NOTE: Force package into crucial-rpm-list for NodeUpdate
+echo "nodebase" > ${vdir}/etc/planetlab/crucial-rpm-list
+cat <<EOF > /tmp/nodebase.spec
+Summary: Dummy Package for initial nodebase
+Name: nodebase
+Version: 0.1
+Release: 0
+Group: System Environment/Base
+License: Apache 2.0
+BuildArch: noarch
+
+%description
+This meta-package with no content allows 'yum update' to work on the m-lab
+nodebase. 
+
+%files
 EOF
+rpmbuild -bb /tmp/nodebase.spec
+cp /root/rpmbuild/RPMS/noarch/nodebase-0.1-0.noarch.rpm ${vdir}/root/
+chroot ${vdir} rpm -ihv /root/nodebase-0.1-0.noarch.rpm