[patch] halt_sh-unionfs-2.patch

halt_sh-unionfs.patch (text/plain), 2.49 KB, created by Martin Schlemmer (RETIRED) on 2005-08-01 11:10:32 UTC

Index: init.d/halt.sh
===================================================================
--- init.d/halt.sh	(revision 1350)
+++ init.d/halt.sh	(working copy)
@@ -7,6 +7,16 @@
 	source /sbin/livecd-functions.sh && \
 	livecd_read_commandline
 
+# livecd-functions.sh should _ONLY_ set this differently if CDBOOT is
+# set, else the simple second one should be used for normal boots.
+if [[ -n ${CDBOOT} && -z ${NO_UMOUNTS} ]] ; then
+	NO_UMOUNTS="/newroot|/mnt/cdrom|/mnt/livecd|/memory"
+# Could also possibly be modified ... just remember this part if for normal
+# (ie, ${CDBOOT} == "") boot, thus not everybody will have livecd-functions.sh
+elif [[ -z ${NO_UMOUNTS} ]] ; then
+	NO_UMOUNTS="/newroot|/memory"
+fi
+
 # Reset pam_console permissions if we are actually using it
 if [[ -x /sbin/pam_console_apply && ! -c /dev/.devfsd && \
       -n $(grep -v -e '^[[:space:]]*#' /etc/pam.d/* | grep 'pam_console') ]]; then
@@ -101,7 +111,7 @@
 # Remove loopback devices started by dm-crypt
 
 remaining=$(awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts | \
-            sort -r | grep -v '/newroot' | grep -v '/mnt/livecd')
+            sort -r | egrep -v "(${NO_UMOUNTS})")
 [[ -n ${remaining} ]] && {
 	sig=
 	retry=3
@@ -118,7 +128,7 @@
 		fi
 
 		remaining=$(awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts | \
-		            sort -r | grep -v '/newroot' | grep -v '/mnt/livecd')
+		            sort -r | egrep -v "(${NO_UMOUNTS})")
 		[[ -z ${remaining} ]] && break
 		
 		/bin/fuser -k -m ${sig} ${remaining} &>/dev/null
@@ -134,15 +144,14 @@
 ebegin "Unmounting filesystems"
 unmounts=$( \
 	awk '{ \
-	    if (($3 !~ /^(proc|devpts|sysfs|devfs|tmpfs|usb(dev)?fs)$/) && \
+	    if (($3 !~ /^(proc|devpts|sysfs|devfs|tmpfs|usb(dev)?fs|unionfs)$/) && \
 	        ($1 != "none") && \
 	        ($1 !~ /^(rootfs|\/dev\/root)$/) && \
 	        ($2 != "/")) \
 	      print $2 }' /proc/mounts | sort -ur)
 for x in ${unmounts}; do
-	# Do not umount these if we are booting off a livecd
-	if [[ -n ${CDBOOT} ]] && \
-	   [[ ${x} == "/mnt/cdrom" || ${x} == "/mnt/livecd" ]] ; then
+	# Do not umount these ... will be different depending on value of CDBOOT
+	if [[ -n $(echo "${x}" | egrep "(${NO_UMOUNTS})") ]] ; then
 		continue
 	fi
 
@@ -195,6 +204,9 @@
 
 	for x in $(awk '$1 != "none" { print $2 }' /proc/mounts | sort -ur) ; do
 		x=${x//\\040/ }
+		if [[ -n $(echo "${x}" | egrep "(${NO_UMOUNTS})") ]] ; then
+			continue
+		fi
 		if [[ ${cmd} == "u" ]]; then
 			umount -n -r "${x}"
 		else