[Ovirt-devel] [PATCH node] fix reboot hang on /etc

[Joey Boggs]

---
 recipe/common-pkgs.ks |    1 +
 recipe/common-post.ks |   15 +++++++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/recipe/common-pkgs.ks b/recipe/common-pkgs.ks
index 3aafe53..bc96b43 100644
--- a/recipe/common-pkgs.ks
+++ b/recipe/common-pkgs.ks
@@ -76,3 +76,4 @@ acpid
 device-mapper-multipath
 kpartx
 dracut-network
+patch
diff --git a/recipe/common-post.ks b/recipe/common-post.ks
index 0f09581..f33984c 100644
--- a/recipe/common-post.ks
+++ b/recipe/common-post.ks
@@ -166,3 +166,18 @@ empty	/mnt
 empty	/live
 empty	/boot
 EOF
+
+# prevent node from hanging on reboot due to /etc mounts
+patch -d /etc/init.d/ -p0 <<\EOF
+--- halt.orig	2010-03-15 16:01:13.677585448 -0400
++++ halt	2010-03-15 16:01:39.798581069 -0400
+@@ -138,7 +138,7 @@ __umount_loop '$3 ~ /^rpc_pipefs$/ || $3
+     $"Unmounting pipe file systems (retry): " \
+     -f
+ 
+-LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/dev/{next}
++LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/etc|^\/dev/{next}
+ 	$3 == "tmpfs" || $3 == "proc" {print $2 ; next}
+ 	/(loopfs|autofs|nfs|cifs|smbfs|ncpfs|sysfs|^none|^\/dev\/ram|^\/dev\/root$)/ {next}
+ 	{print $2}' /proc/mounts \
+EOF
-- 
1.6.6.1