Author: baggins                      Date: Wed Apr  4 21:26:54 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- statd is needed only for NFSv2 or NFSv3

---- Files affected:
SOURCES:
   nfslock.init (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SOURCES/nfslock.init
diff -u SOURCES/nfslock.init:1.14 SOURCES/nfslock.init:1.15
--- SOURCES/nfslock.init:1.14   Tue Mar 20 16:14:55 2007
+++ SOURCES/nfslock.init        Wed Apr  4 23:26:49 2007
@@ -50,10 +50,14 @@
                [ -n "$STATD_OUTPORT" ] && STATDOPTS="$STATDOPTS -o 
$STATD_OUTPORT"
 
                # Start daemons.
-               msg_starting "NFS statd"
-               daemon rpc.statd $STATDOPTS
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nfslock
+               if is_yes "$NFSv2" || is_yes "$NFSv3" ; then
+                       msg_starting "NFS statd"
+                       daemon rpc.statd $STATDOPTS
+                       RETVAL=$?
+                       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nfslock
+               else
+                       touch /var/lock/subsys/nfslock
+               fi
        else
                msg_already_running "NFS statd"
        fi
@@ -69,8 +73,10 @@
                        /sbin/sysctl -w fs.nfs.nlm_udpport=0 >/dev/null 2>&1
                fi
                # Stop daemons.
-               msg_stopping "NFS statd"
-               killproc rpc.statd
+               if is_yes "$NFSv2" || is_yes "$NFSv3" ; then
+                       msg_stopping "NFS statd"
+                       killproc rpc.statd
+               fi
                rm -f /var/lock/subsys/nfslock
        else
                msg_not_running "NFS statd"
@@ -87,8 +93,13 @@
        stop
        ;;
   status)
-       status rpc.statd
-       exit $?
+       if is_yes "$NFSv2" || is_yes "$NFSv3" ; then
+               status rpc.statd
+               exit $?
+       else
+               echo "NFSv2 and NFSv3 disabled"
+               exit 0
+       fi
        ;;
   restart|force-reload)
        stop
@@ -99,9 +110,13 @@
                echo start
                exit 0
        fi
-       /sbin/pidof rpc.statd >/dev/null 2>&1; STATD="$?"
-       if [ $STATD = 1 ]; then
-               echo restart
+       if is_yes "$NFSv2" || is_yes "$NFSv3" ; then
+               /sbin/pidof rpc.statd >/dev/null 2>&1; STATD="$?"
+               if [ $STATD = 1 ]; then
+                       echo restart
+                       exit 0
+               fi
+       else
                exit 0
        fi
        ;;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/nfslock.init?r1=1.14&r2=1.15&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to