From 328e7a968515028d5668a63e6f4851a9c8c7e4a3 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 4 Jan 2011 11:37:07 -0500
Subject: Rework to handle bind-mounted cifs/ncpfs (#663140,
 <dmudrich@nospam.mudrichsystems.com>)

---
 rc.d/init.d/netfs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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

diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 501a8cb0..8d9854fb 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -25,8 +25,8 @@ NCPFSTAB=$(LC_ALL=C awk '!/^#/ && $3 == "ncpfs" && $4 !~ /noauto/ { print $2 }'
 NETDEVFSTAB=$(LC_ALL=C awk '!/^#/ && $4 ~/_netdev/ && $4 !~ /noauto/ { print $1 }' /etc/fstab)
 
 NFSMTAB=$(LC_ALL=C awk '$3 ~ /^nfs/ && $3 != "nfsd" && $2 != "/" { print $2 }' /proc/mounts)
-CIFSMTAB=$(LC_ALL=C awk '$3 == "cifs" { print $2 }' /proc/mounts)
-NCPMTAB=$(LC_ALL=C awk '$3 == "ncpfs" { print $2 }' /proc/mounts)
+CIFSMTAB=$(LC_ALL=C awk '$3 == "cifs" { print $2 }' /proc/mounts | tac)
+NCPMTAB=$(LC_ALL=C awk '$3 == "ncpfs" { print $2 }' /proc/mounts | tac)
 NETDEVMTAB=$(LC_ALL=C awk '$4 ~ /_netdev/ && $2 != "/" { print $2 }' /etc/mtab)
 
 # See how we were called.
@@ -117,8 +117,16 @@ case "$1" in
 			$"Unmounting NFS filesystems (retry): " \
 			"-f -l"
 	fi
-	[ -n "$CIFSMTAB" ] && action $"Unmounting CIFS filesystems: " umount -a -t cifs
-	[ -n "$NCPMTAB" ] && action $"Unmounting NCP filesystems: " umount -a -t ncp,ncpfs
+	if [ -n "$CIFSMTAB" ]; then
+		for MNT in $CIFSMTAB; do
+			action $"Unmounting CIFS filesystem: $MNT" umount "$MNT"
+		done
+	fi
+	if [ -n "$NCPMTAB" ]; then
+		for MNT in $NCPMTAB; do
+			action $"Unmounting NCP filesystem: $MNT" umount "$MNT"
+		done
+	fi
 	rm -f /var/lock/subsys/netfs
 	;;
   status)
-- 
cgit v1.2.1