- fix unmount:

	- don't force and all
	- skip / and /usr (rc.shutdown will do it for us)

Changed files:
    nfsfs.init -> 1.39

diff --git a/nfsfs.init b/nfsfs.init
index d25609165c518bcd27d5fbe5cf9890f593f6441b..29e936c78726ee7ca8dc0cd304361881d82edf6d 100644 (file)
--- a/nfsfs.init
+++ b/nfsfs.init
@@ -72,13 +72,20 @@ stop() {
        show "Unmounting NFS filesystems"
        busy
        retry=3
-       remaining=$(awk '$3 ~ /^nfs(4$|$)/ {print $2}' $fsfile)
+       remaining=$(awk '$3 ~ /^nfs(4$|$)/ && $2 !~ /^\/(usr$|$)/ {print $2}' $fsfile)
        while [ -n "$remaining" -a $retry -gt 0 ]; do
-               fuser -msk -TERM `awk '$3 ~ /^nfs(4$|$)/ {print $2}' < $fsfile`
+               fuser -msk -TERM `awk '$3 ~ /^nfs(4$|$)/ && $2 !~ /^\/(usr$|$)/ {print $2}' < $fsfile`
                sleep 2
-               fuser -msk -KILL `awk '$3 ~ /^nfs(4$|$)/ {print $2}' < $fsfile`
-               umount -a -f -t nfs,nfs4
-               remaining=$(awk '$3 ~ /^nfs(4$|$)/ {print $2}' $fsfile)
+               fuser -msk -KILL `awk '$3 ~ /^nfs(4$|$)/ && $2 !~ /^\/(usr$|$)/ {print $2}' < $fsfile`
+               # Sort filesystems to unmount in reverse order
+               rem=""
+               for r in $(awk '$3 ~ /^nfs(4$|$)/ && $2 !~ /^\/(usr$|$)/ {print $2}' $fsfile) ; do
+                       rem="$r $rem"
+               done
+               for fs in $rem ; do
+                       umount $fs
+               done
+               remaining=$(awk '$3 ~ /^nfs(4$|$)/ && $2 !~ /^\/(usr$|$)/ {print $2}' $fsfile)
                retry=$(($retry-1))
        done
        ok