From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Mon, 29 Sep 2008 17:13:59 +0000 (+0000)
Subject: disable the 'halt' patch, and enable util-vserver init script that should help
X-Git-Tag: 4.3-rc1~154
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6f04f32688a7f88dbc68316e19671511f6e60765;p=build.git

disable the 'halt' patch, and enable util-vserver init script that should help
shutdown all slices automatically.
---

diff --git a/config.planetlab/bootstrapfs.post b/config.planetlab/bootstrapfs.post
index c2535bda..58d0ffc2 100644
--- a/config.planetlab/bootstrapfs.post
+++ b/config.planetlab/bootstrapfs.post
@@ -7,8 +7,14 @@ if [ -z "${vdir}" ] ; then
 	exit
 fi
 
+# NOTE: we're enabling util-vserver to allow it to help shutdown all slices
+# before rebooting.  This has been problematic in the past.
+for service in util-vserver; do
+    chroot ${vdir} /sbin/chkconfig $service on
+done
+
 # Remove unneeded services
-for service in util-vserver vprocunhide vservers-default; do
+for service in vprocunhide vservers-default; do
     chroot ${vdir} /sbin/chkconfig $service off
 done
 
@@ -18,25 +24,28 @@ echo > ${vdir}/etc/sysconfig/crontab
 # Add site_admin account
 chroot ${vdir} /usr/sbin/useradd -p "" -u 502 -m site_admin
 
-# NOTE: this is added to ensure that processes running within the slices that
+# 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
+#( 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.