From 68196b57a6a37f786043129e39eb00852e8ad14e Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 24 Jul 2001 21:08:00 +0000
Subject: fix netdev umount stuff

---
 rc.d/init.d/netfs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

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

diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index ba5a0eb1..4ffed775 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -25,6 +25,7 @@ fi
 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}'`
 NCPFSTAB=`grep -v '^#' /etc/fstab | awk '{ if ($3 ~ /^ncpfs$/ && $4 !~ /noauto/) print $2}'`
+NETDEVMTAB=`grep -v '^#' /proc/mounts | awk '{ if (($4 ~ /_netdev$/) && ($2 != "/")) print $2}'`
 NFSMTAB=`grep -v '^#' /proc/mounts | awk '{ if (($3 ~ /nfs$/) && ($2 != "/")) print $2}'`
 SMBMTAB=`grep -v '^#' /proc/mounts | awk '{ if ($3 ~ /^smbfs$/ ) print $2}'`
 NCPMTAB=`grep -v '^#' /proc/mounts | awk '{ if ($3 ~ /^ncpfs$/ ) print $2}'`
@@ -63,7 +64,25 @@ case "$1" in
 			sig=-9
 		done
 	}
-	action $"Unmounting network block filesystems: " umount -a -O netdev
+  	[ -n "$NETDEVMTAB" ] && {
+		sig=
+		retry=3
+		while [ -n "$remaining" -a "$retry" -gt 0 ]
+		do
+			if [ "$retry" -lt 3 ]; then
+				action $"Unmounting network block filesystems (retry): " umount -a -O _netdev
+			else
+				action $"Unmounting network block filesystems: " umount -a -O _netdev
+			fi
+			sleep 2
+			remaining=`awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" {print $2}' /proc/mounts`
+			[ -z "$remaining" ] && break
+			/sbin/fuser -k -m $sig $remaining >/dev/null
+			sleep 5
+			retry=$(($retry - 1))
+			sig=-9
+		done
+	}
   	[ -n "$NFSMTAB" ] && {
 		sig=
 		retry=3
-- 
cgit v1.2.1