Backport some fixes from the 7.2 branch:

- unmounting of loopback devices
- unmounting of /initrd
- don't blow up on ext3/reiserfs in /etc/init.d/halt
- module alias determination fixes
- quota tweaks

4 files changed, 32 insertions, 13 deletions

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index ee2704c4..605f74d5 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -92,7 +92,8 @@ daemon() {
 		   shift 2
 		   ;;
 	    --check=?*)
-	    	   base=${1#--user=}
+	    	   base=${1#--check=}
+		   gotbase="yes"
 		   shift
 		   ;;
 	    --user)
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index 501ed0d3..be328d0c 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -25,6 +25,11 @@ runcmd() {
    echo
 }
 
+halt_get_remaining() {
+	awk '!/(^#|proc|loopfs|autofs|^none|^\/dev\/root| \/ )/ {print $2}' /proc/mounts
+	awk '{ if ($3 ~ /^proc$/ && $2 !~ /^\/proc/) print $2; }' /proc/mounts
+}
+
 # See how we were called.
 case "$0" in
   *halt)
@@ -84,7 +89,7 @@ if [ -f /etc/sysconfig/clock ]; then
 fi
 
 CLOCKDEF=""
-CLOCKFLAGS="--systohc"
+CLOCKFLAGS="$CLOCKFLAGS --systohc"
 
 case "$UTC" in
    yes|true)
@@ -123,6 +128,7 @@ SWAPS=`awk '! /^Filename/ { print $1 }' /proc/swaps`
 # Unmount file systems, killing processes if we have to.
 # Unmount loopback stuff first
 remaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts`
+devremaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts`
 [ -n "$remaining" ] && {
 	sig=
 	retry=3
@@ -131,9 +137,14 @@ remaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/moun
 		if [ "$retry" -lt 3 ]; then
 			runcmd $"Unmounting loopback filesystems (retry):" umount $remaining
 		else
-			runcmd $"Unmounting loobpack filesystems: " umount $remaining
+			runcmd $"Unmounting loopback filesystems: " umount $remaining
 		fi
+		for dev in $devremaining ; do
+			losetup $dev > /dev/null 2>&1 && \
+				runcmd $"Detaching loopback device $dev: " losetup -d $device
+		done
 		remaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts`
+		devremaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts`
 		[ -z "$remaining" ] && break
 		/sbin/fuser -k -m $sig $remaining >/dev/null
 		sleep 5
@@ -144,33 +155,34 @@ remaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/moun
 
 sig=
 retry=3
-remaining=`awk '!/(^#|proc|loopfs|autofs|^none|^\/dev\/root| \/ )/ {print $2}' /proc/mounts`
+remaining=`halt_get_remaining | sort -r`
+
 while [ -n "$remaining" -a "$retry" -gt 0 ]
 do
 	if [ "$retry" -lt 3 ]; then
-		LANG=C runcmd $"Unmounting file systems (retry): "  umount -a -f -t noproc
+		LANG=C runcmd $"Unmounting file systems (retry): "  umount -f $remaining
 	else
-		LANG=C runcmd $"Unmounting file systems: "  umount -a -f -t noproc
+		LANG=C runcmd $"Unmounting file systems: "  umount -f $remaining
 	fi
 	sleep 2
-	remaining=`awk '!/(^#|proc|loopfs|autofs|^none|^\/dev\/root| \/ )/ {print $2}' /proc/mounts`
+	remaining=`halt_get_remaining | sort -r`
 	[ -z "$remaining" ] && break
 	/sbin/fuser -k -m $sig $remaining >/dev/null
 	sleep 5
 	retry=$(($retry-1))
 	sig=-9
 done
-
 [ -f /proc/bus/usb/devices ] && umount /proc/bus/usb
 
+# Try them all, one last time.
+umount -a -f
+
 # Remount read only anything that's left mounted.
 #echo $"Remounting remaining filesystems (if any) readonly"
-mount | awk '/ext2/ { print $3 }' | while read line; do
+mount | awk '/( \/ |^\/dev\/root)/ { print $3 }' | while read line; do
     mount -n -o ro,remount $line
 done
 
-runcmd $"Unmounting proc file system: " umount /proc
-
 # Now halt or reboot.
 echo $"$message"
 if [ -f /fastboot ]; then
diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 97a46d1b..adea6665 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -20,7 +20,7 @@ fi
 . /etc/sysconfig/network
 
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+[ "${NETWORKING}" = "no" ] && exit 0
 
 NFSFSTAB=`grep -v '^#' /etc/fstab | awk '{ if ($3 ~ /^nfs$/ && $4 !~ /noauto/) print $2}'`
 SMBFSTAB=`grep -v '^#' /etc/fstab | awk '{ if ($3 ~ /^smbfs$/ && $4 !~ /noauto/) print $2}'`
@@ -45,6 +45,7 @@ case "$1" in
   stop)
         # Unmount loopback stuff first
 	remaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts`
+	devremaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts`
 	[ -n "$remaining" ] && {
 	        sig=
 		retry=3
@@ -55,7 +56,12 @@ case "$1" in
 			else
 				action $"Unmounting loopback filesystems: " umount $remaining
 		        fi
+			for dev in $devremaining ; do
+				losetup $dev >/dev/null 2>&1 && \
+				action $"Detaching loopback device $dev: " losetup -d $dev
+			done	
 			remaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts`
+			devremaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts`
 			[ -z "$remaining" ] && break
 			/sbin/fuser -k -m $sig $remaining >/dev/null
 			sleep 5
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 5407b878..fd69537a 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -31,7 +31,7 @@ fi
 
 # If IPv6 is explicitly configured, make sure it's available.
 if [ "$NETWORKING_IPV6" = "yes" ]; then
-	alias=`modprobe -c | grep net-pf-10 | awk '{ print $3 }'`
+	alias=`modprobe -c | awk '/^alias net-pf-10 / { print $3 }'`
 	if [ "$alias" != "ipv6" -a ! -f /proc/net/if_inet6 ]; then
 		echo "alias net-pf-10 ipv6" >> /etc/modules.conf
 	fi