[patch] Work without error?

x (text/plain), 860 bytes, created by Roy Marples (RETIRED) on 2006-12-14 11:20:06 UTC

Index: halt.sh
===================================================================
--- halt.sh	(revision 2421)
+++ halt.sh	(working copy)
@@ -106,6 +106,11 @@
 		continue
 	fi
 
+	# If we're using the mount (probably /usr) then don't unmount us
+	if [[ " $(fuser -m "${x}" 2>/dev/null) " == *" $$ "* ]] ; then
+		continue
+	fi
+
 	if ! umount "${x}" &>/dev/null; then
 		# Kill processes still using this mount
 		/bin/fuser -s -k -9 -m "${x}"
@@ -156,9 +161,13 @@
 
 	for x in $(awk '{print $2}' /proc/mounts | sort -ur) ; do
 		x=${x//\\040/ }
-		if [[ -n $(echo "${x}" | egrep "${RC_NO_UMOUNTS}") ]] ; then
+
+		# Do not umount these ... will be different depending on value of CDBOOT
+		if [[ ${x} != "/" \
+			&& -n $(echo "${x}" | egrep "${RC_NO_UMOUNTS}") ]] ; then
 			continue
 		fi
+		
 		if [[ ${cmd} == "u" ]]; then
 			umount -n -r "${x}"
 		else