- nfs and nfs4 are different filesystems, so mount them separately

Changed files:
    nfsfs.init -> 1.30

diff --git a/nfsfs.init b/nfsfs.init
index 919319bab2a8c089e0a080dcf3fe62b9c4e8a925..1e2771eab97124f2101bc13e6f5e2a711dd76fcb 100644 (file)
--- a/nfsfs.init
+++ b/nfsfs.init
@@ -38,6 +38,7 @@ fi
 
 start() {
        if [ ! -f /var/lock/subsys/nfsfs ]; then
+               run_cmd "Mounting NFS filesystems" mount -a -t nfs
                if is_yes "$NFS4" ; then
                    if grep -q nfs4 /proc/filesystems; then
                        modprobe -s nfs > /dev/null 2>&1
@@ -56,10 +57,10 @@ start() {
                            daemon rpc.gssd -m $RPCGSSOPTIONS
                            [ $? -eq 0 ] && touch /var/lock/subsys/gssd
                        fi
+                       run_cmd "Mounting NFSv4 filesystems" mount -a -t nfs4
                    fi
                fi
-           run_cmd "Mounting NFS filesystems" mount -a -t nfs
-           touch /var/lock/subsys/nfsfs
+               touch /var/lock/subsys/nfsfs
        else
            msg_already_running "NFSFS"
        fi
@@ -72,21 +73,21 @@ stop() {
                fsfile="/etc/mtab"
        fi
 
-       show "Unmounting NFS filesystems"
-       busy
-       retry=3
-       remaining=$(awk '$3 == "nfs" {print $2}' $fsfile)
-       while [ -n "$remaining" -a $retry -gt 0 ]; do
-               fuser -msk -TERM `awk '$3 == "nfs" {print $2}' < $fsfile`
-               sleep 2
-               fuser -msk -KILL `awk '$3 == "nfs" {print $2}' < $fsfile`
-               umount -a -f -t nfs
-               remaining=$(awk '$3 == "nfs" {print $2}' $fsfile)
-               retry=$(($retry-1))
-       done
-       ok
        if is_yes "$NFS4" ; then
                if grep -q nfs4 /proc/filesystems; then
+                   show "Unmounting NFSv4 filesystems"
+                   busy
+                   retry=3
+                   remaining=$(awk '$3 == "nfs4" {print $2}' $fsfile)
+                   while [ -n "$remaining" -a $retry -gt 0 ]; do
+                       fuser -msk -TERM `awk '$3 == "nfs4" {print $2}' < $fsfile`
+                       sleep 2
+                       fuser -msk -KILL `awk '$3 == "nfs4" {print $2}' < $fsfile`
+                       umount -a -f -t nfs4
+                       remaining=$(awk '$3 == "nfs4" {print $2}' $fsfile)
+                       retry=$(($retry-1))
+                   done
+                   ok
                    if [ -f /var/lock/subsys/gssd ]; then
                        msg_stopping "NFS gssd"
                        killproc rpc.gssd
@@ -99,6 +100,19 @@ stop() {
                    fi
                fi
        fi
+       show "Unmounting NFS filesystems"
+       busy
+       retry=3
+       remaining=$(awk '$3 == "nfs" {print $2}' $fsfile)
+       while [ -n "$remaining" -a $retry -gt 0 ]; do
+               fuser -msk -TERM `awk '$3 == "nfs" {print $2}' < $fsfile`
+               sleep 2
+               fuser -msk -KILL `awk '$3 == "nfs" {print $2}' < $fsfile`
+               umount -a -f -t nfs
+               remaining=$(awk '$3 == "nfs" {print $2}' $fsfile)
+               retry=$(($retry-1))
+       done
+       ok
        rm -f /var/lock/subsys/nfsfs
 }