X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=etc%2Fredhat%2Fnfslock.init;h=2f99c45a0f2498afbdea0388601d1bbaa47554c9;hp=469840ce99a95e50eae9cc7e3212018243921bf9;hb=2c91715a9c8dbf18df1666f70e78d6e36e123ca0;hpb=852eb5d16f99b9e76ed3b2d2ea3c0017a8590eb0

diff --git a/etc/redhat/nfslock.init b/etc/redhat/nfslock.init
index 469840c..2f99c45 100755
--- a/etc/redhat/nfslock.init
+++ b/etc/redhat/nfslock.init
@@ -3,7 +3,7 @@
 # nfslock       This shell script takes care of starting and stopping
 #               the NFS file locking service.
 #
-# chkconfig: 345 60 20
+# chkconfig: 345 60 86
 # description: NFS is a popular protocol for file sharing across \
 #	       TCP/IP networks. This service provides NFS file \
 #	       locking functionality.
@@ -25,6 +25,12 @@ fi
 [ -x /sbin/rpc.lockd ] || exit 0
 [ -x /sbin/rpc.statd ] || exit 0
 
+if [ -n "${STATD_HOSTNAME}" ]; then
+    STATDARG="-n ${STATD_HOSTNAME}"
+else
+    STATDARG=""
+fi
+
 # See how we were called.
 case "$1" in
   start)
@@ -34,7 +40,7 @@ case "$1" in
 	daemon rpc.lockd
 	echo
 	echo -n "Starting NFS statd: "
-	daemon rpc.statd
+	daemon rpc.statd ${STATDARG}
 	echo
 	touch /var/lock/subsys/nfslock
 	;;
@@ -45,7 +51,7 @@ case "$1" in
 	if [ -n "$pidlist" ]; then
 		pid=
 		for apid in $pidlist ; do
-			[ -d /proc/$apid ] && pid="$pid $apid"
+			[ -f /proc/$apid/exe ] && pid="$pid $apid"
 		done
 		if [ -n "$pid" ]; then
 			echo -n "Shutting down NFS lockd: "
@@ -63,15 +69,8 @@ case "$1" in
 	status rpc.statd
 	;;
   restart)
-	echo -n "Restarting NFS file locking services: "
-	echo -n "rpc.lockd "
-	killproc lockd
-	daemon rpc.lockd
-	echo -n "rpc.statd "
-	killproc rpc.statd
-	daemon rpc.statd
-	touch /var/lock/subsys/nfslock
-	echo "done."
+	$0 stop
+	$0 start
 	;;
   probe)
 	if [ ! -f /var/lock/subsys/nfslock ] ; then