From cade9e7d30534d1ab9696b41db01e44ce641aa07 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Thu, 5 Apr 2007 17:47:34 +0000
Subject: [PATCH] - drop NFSv2/3 hack, these setting are only available on
 server

Changed files:
    nfslock.init -> 1.17
---
 nfslock.init | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/nfslock.init b/nfslock.init
index 29e7801..d539c0c 100644
--- a/nfslock.init
+++ b/nfslock.init
@@ -21,7 +21,7 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-		msg_network_down "NFS lockd"
+		msg_network_down "NFS statd"
 		exit 1
 	fi
 else
@@ -50,14 +50,10 @@ start() {
 		[ -n "$STATD_OUTPORT" ] && STATDOPTS="$STATDOPTS -o $STATD_OUTPORT"
 
 		# Start daemons.
-		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
+		msg_starting "NFS statd"
+		daemon rpc.statd $STATDOPTS
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nfslock
 	else
 		msg_already_running "NFS statd"
 	fi
@@ -73,10 +69,8 @@ stop() {
 			/sbin/sysctl -w fs.nfs.nlm_udpport=0 >/dev/null 2>&1
 		fi
 		# Stop daemons.
-		if is_yes "$NFSv2" || is_yes "$NFSv3" ; then
-			msg_stopping "NFS statd"
-			killproc rpc.statd
-		fi
+		msg_stopping "NFS statd"
+		killproc rpc.statd
 		rm -f /var/lock/subsys/nfslock
 	else
 		msg_not_running "NFS statd"
@@ -93,13 +87,8 @@ case "$1" in
   	stop
 	;;
   status)
-	if is_yes "$NFSv2" || is_yes "$NFSv3" ; then
-		status rpc.statd
-		exit $?
-	else
-		echo "NFSv2 and NFSv3 disabled"
-		exit 0
-	fi
+	status rpc.statd
+	exit $?
 	;;
   restart|force-reload)
 	stop
@@ -110,13 +99,9 @@ case "$1" in
 		echo start
 		exit 0
 	fi
-	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
+	/sbin/pidof rpc.statd >/dev/null 2>&1; STATD="$?"
+	if [ $STATD = 1 ]; then
+		echo restart
 		exit 0
 	fi
 	;;
-- 
2.44.0