From: soltesz@opentechinstitute.org <soltesz@opentechinstitute.org>
Date: Tue, 30 Apr 2013 19:03:45 +0000 (-0400)
Subject: hard-code crucial-rpm-list for nodeupdate in mlab
X-Git-Tag: 5.2.2~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=841734295327c07a4bd7cc9f79f5ef6ecd418d76;p=build.git

hard-code crucial-rpm-list for nodeupdate in mlab
---

diff --git a/config.mlab/nodeimage.post b/config.mlab/nodeimage.post
index 79d54fe3..91072871 100644
--- a/config.mlab/nodeimage.post
+++ b/config.mlab/nodeimage.post
@@ -65,28 +65,5 @@ 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}."
-EOF
+# NOTE: Force package into crucial-rpm-list for NodeUpdate
+echo "nodebase" > ${vdir}/etc/planetlab/crucial-rpm-list