From 52e01148b171341e7dc35de12672dd9bd70124d3 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 21 Sep 2001 15:41:15 +0000
Subject: umount /dev/loopX doesn't work; you must use the mount point

---
 rc.d/init.d/halt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'rc.d/init.d/halt')

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
-- 
cgit v1.2.1