- nfs4 work

Changed files:
    nfs.init -> 1.23
    nfsfs.init -> 1.19

diff --git a/nfs.init b/nfs.init
index 2fcb800ed98f00637cf15205ce8134fdaec48293..33a7b8faee1a43d5053639de1678732bc8ad6f5b 100644 (file)
--- a/nfs.init
+++ b/nfs.init
@@ -55,11 +55,20 @@ case "$1" in
                            grep -q nfsd /proc/filesystems && \
                            ! grep -q nfsd /proc/mounts; then
                                run_cmd "Mounting /proc/fs/nfsd filesystem" mount -t nfsd nfsd /proc/fs/nfsd
+                           grep -q rpc_pipefs /proc/filesystems && \
+                           ! grep -q rpc_pipefs /proc/mounts; then
+                               run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
                        fi
                        msg_starting "NFS"
                        daemon /usr/sbin/exportfs -r
                        msg_starting "NFS mountd"
                        daemon rpc.mountd $RPCMOUNTOPTIONS
+                       if (grep -q nfs4 /proc/filesystems); then
+                           msg_starting "NFS idmapd"
+                           daemon rpc.idmapd $RPCIDMAPOPTIONS
+                           msg_starting "NFS svcgssd"
+                           daemon rpc.svcgssd $RPCSVCGSSOPTIONS
+                       fi
                        msg_starting "NFS daemon"
                        daemon rpc.nfsd $RPCNFSDCOUNT
                fi
@@ -81,6 +90,12 @@ case "$1" in
                        killproc rpc.mountd
                        msg_stopping "NFS daemon"
                        killproc nfsd -QUIT
+                       if (grep -q nfs4 /proc/filesystems); then
+                           msg_stopping "NFS svcgssd"
+                           killproc rpc.svcgssd
+                           msg_stopping "NFS idmapd"
+                           killproc rpc.idmapd
+                       fi
                        msg_stopping "NFS"
                        daemon /usr/sbin/exportfs -au
                fi

diff --git a/nfsfs.init b/nfsfs.init
index a4d91d608bf73ab2b31119a221b0600850da9531..348cae77b349d4eb8aed25234508170a75a06f74 100644 (file)
--- a/nfsfs.init
+++ b/nfsfs.init
@@ -37,8 +37,18 @@ fi
 # See how we were called.
 case "$1" in
   start)
-       run_cmd "Mounting NFS filesystems" mount -a -t nfs
-       touch /var/lock/subsys/nfsfs
+       if [ ! -f /var/lock/subsys/nfsfs ]; then
+           if [ "$NFSDTYPE" != "U" ] && grep -q nfs4 /proc/filesystems; then
+               msg_starting "NFS idmapd"
+               daemon rpc.cidmapd $RPCIDMAPOPTIONS
+               msg_starting "NFS gssd"
+               daemon rpc.gssd $RPCGSSOPTIONS
+           fi
+           run_cmd "Mounting NFS filesystems" mount -a -t nfs
+           touch /var/lock/subsys/nfsfs
+       else
+           msg_already_running "NFSFS"
+       fi
        ;;
   stop)
        if [ -f /proc/mounts ]; then
@@ -60,6 +70,12 @@ case "$1" in
                retry=$(($retry-1))
        done
        ok
+       if [ "$NFSDTYPE" != "U" ] && grep -q nfs4 /proc/filesystems; then
+           msg_stopping "NFS gssd"
+           killproc rpc.gssd
+           msg_stopping "NFS idmapd"
+           killproc rpc.cidmapd
+       fi
        rm -f /var/lock/subsys/nfsfs
        ;;
   status)