From 29066c696dfaa73bdae2f36ce5e5bb2fff0f1208 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 2 Oct 2006 20:01:01 +0000
Subject: [PATCH] - unify order for status - "Sanity checks" unneccessary due
 rpm integrity

Changed files:
    nfs.init -> 1.36
---
 nfs.init | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/nfs.init b/nfs.init
index 1750e6f..e13ca8f 100644
--- a/nfs.init
+++ b/nfs.init
@@ -21,18 +21,13 @@
 # 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 NFSD
+		msg_network_down "NFS daemon"
 		exit 1
 	fi
 else
 	exit 0
 fi
 
-# Sanity checks
-[ -x /usr/sbin/rpc.nfsd ] || exit 0
-[ -x /usr/sbin/rpc.mountd ] || exit 0
-[ -f /etc/exports ] || exit 0
-
 start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/nfs ]; then
@@ -75,7 +70,7 @@ start() {
 		daemon rpc.nfsd $RPCNFSDCOUNT
 		touch /var/lock/subsys/nfs
 	else
-		msg_already_running "NFS"
+		msg_already_running "NFS daemon"
 	fi
 }
 
@@ -114,13 +109,6 @@ case "$1" in
   stop)
   	stop
 	;;
-  status)
-	status rpc.mountd
-	RETVAL=$?
-	status nfsd
-	RET=$?
-	[ $RETVAL -eq 0 ] && RETVAL=$RET
-	;;
   restart)
 	stop
 	start
@@ -153,6 +141,13 @@ case "$1" in
 		exit 0
 	fi
 	;;
+  status)
+	status rpc.mountd
+	RETVAL=$?
+	status nfsd
+	RET=$?
+	[ $RETVAL -eq 0 ] && RETVAL=$RET
+	;;
   *)
 	msg_usage "$0 {start|stop|restart|reload|force-reload|probe|status}"
 	exit 3
-- 
2.44.0