From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Thu, 16 Jul 2009 04:47:28 +0000 (+0000)
Subject: remove the site specific cisco hack
X-Git-Tag: 4.3-rc11~83
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=01a8d6d9e798a4b993bc43c95448426a33ed80b1;p=build.git

remove the site specific cisco hack
---

diff --git a/config.coblitz/bootstrapfs.post b/config.coblitz/bootstrapfs.post
index dd6b93e4..dd33c4e5 100644
--- a/config.coblitz/bootstrapfs.post
+++ b/config.coblitz/bootstrapfs.post
@@ -24,48 +24,3 @@ echo > ${vdir}/etc/sysconfig/crontab
 
 # Add site_admin account
 chroot ${vdir} /usr/sbin/useradd -p "" -u 502 -m site_admin
-
-# NOTE:  Removed due to incompatibility between fedora and centos, and b/c we
-# expect that enabling util-vserver above will help with shutdown.
-#
-# : this is added to ensure that processes running within the slices that
-# may have special permissions and other parts of the filesystem engated are
-# killed before shutdown.  We experienced hangs when rebooting without this
-# step.
-#( 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
-
-# NOTE:  This is added to relieve one site's Cisco router configuration that
-# fails to recognize the host once the arping is sent out.
-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