- update for special idmapd hangling

Changed files:
    nfs.init -> 1.24
    nfsfs.init -> 1.20

diff --git a/nfs.init b/nfs.init
index 33a7b8faee1a43d5053639de1678732bc8ad6f5b..72cd3431b28c4e1836615802b16a77b87331e023 100644 (file)
--- a/nfs.init
+++ b/nfs.init
@@ -64,8 +64,11 @@ case "$1" in
                        msg_starting "NFS mountd"
                        daemon rpc.mountd $RPCMOUNTOPTIONS
                        if (grep -q nfs4 /proc/filesystems); then
-                           msg_starting "NFS idmapd"
-                           daemon rpc.idmapd $RPCIDMAPOPTIONS
+                           if [ ! -f /var/lock/subsys/idmapd ]; then
+                               msg_starting "NFS idmapd"
+                               daemon rpc.idmapd $RPCIDMAPOPTIONS
+                               [ $? = 0 ] && touch /var/lock/subsys/idmapd
+                           fi
                            msg_starting "NFS svcgssd"
                            daemon rpc.svcgssd $RPCSVCGSSOPTIONS
                        fi
@@ -93,8 +96,10 @@ case "$1" in
                        if (grep -q nfs4 /proc/filesystems); then
                            msg_stopping "NFS svcgssd"
                            killproc rpc.svcgssd
-                           msg_stopping "NFS idmapd"
-                           killproc rpc.idmapd
+                           if [ -f /var/lock/subsys/idmapd -a ! -f /var/lock/subsys/nfsfs ]; then
+                               msg_stopping "NFS idmapd"
+                               killproc rpc.idmapd
+                           fi
                        fi
                        msg_stopping "NFS"
                        daemon /usr/sbin/exportfs -au

diff --git a/nfsfs.init b/nfsfs.init
index 348cae77b349d4eb8aed25234508170a75a06f74..3b83613ee99c4f0a6941f96ed0290678a41c6750 100644 (file)
--- a/nfsfs.init
+++ b/nfsfs.init
@@ -39,8 +39,10 @@ case "$1" in
   start)
        if [ ! -f /var/lock/subsys/nfsfs ]; then
            if [ "$NFSDTYPE" != "U" ] && grep -q nfs4 /proc/filesystems; then
-               msg_starting "NFS idmapd"
-               daemon rpc.cidmapd $RPCIDMAPOPTIONS
+               if [ ! -f /var/lock/subsys/idmapd ]; then
+                   msg_starting "NFS idmapd"
+                   daemon rpc.cidmapd $RPCIDMAPOPTIONS
+               fi
                msg_starting "NFS gssd"
                daemon rpc.gssd $RPCGSSOPTIONS
            fi
@@ -73,8 +75,10 @@ case "$1" in
        if [ "$NFSDTYPE" != "U" ] && grep -q nfs4 /proc/filesystems; then
            msg_stopping "NFS gssd"
            killproc rpc.gssd
-           msg_stopping "NFS idmapd"
-           killproc rpc.cidmapd
+           if [ -f /var/lock/subsys/idmapd -a ! -f /var/lock/subsys/nfs ]; then
+               msg_stopping "NFS idmapd"
+               killproc rpc.cidmapd
+           fi
        fi
        rm -f /var/lock/subsys/nfsfs
        ;;