aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xrc.d/init.d/halt6
-rwxr-xr-xrc.d/init.d/netfs6
2 files changed, 8 insertions, 4 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index 39e1febd..19e21a28 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -127,7 +127,8 @@ 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 $1}' /proc/mounts`
+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
@@ -138,11 +139,12 @@ remaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/moun
else
runcmd $"Unmounting loopback filesystems: " umount $remaining
fi
- for dev in $remaining ; do
+ 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
diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 4a6a215f..dbd8b58a 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -45,7 +45,8 @@ case "$1" in
;;
stop)
# Unmount loopback stuff first
- remaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts`
+ 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
@@ -56,11 +57,12 @@ case "$1" in
else
action $"Unmounting loopback filesystems: " umount $remaining
fi
- for dev in $remaining ; do
+ 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