From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Mon, 8 Mar 2010 18:15:33 +0000 (+1100)
Subject: Change the test if NFS is working to use "service nfs status"
X-Git-Url: http://git.samba.org/?p=metze%2Fctdb%2Fwip.git;a=commitdiff_plain;h=94f12fdd17a817662eac2135d98549ab394eafc1

Change the test if NFS is working to use "service nfs status"
instead of rpcinfo to the nfs program.
---

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 2115d46e..61c8081a 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -75,10 +75,10 @@ case "$1" in
 		echo "ERROR: STATD is not responding. Trying to restart it. [rpc.statd $RPCSTATDOPTS]"
 	}
 
-
-	# check that NFS responds to rpc requests
-	[ "$CTDB_NFS_SKIP_KNFSD_ALIVE_CHECK" = "yes" ] || {
-	    ctdb_check_rpc "NFS" 100003 3
+	# check that NFS is running
+	service nfs status 2>/dev/null >/dev/null || {
+		echo NFS is not running
+		exit 1
 	}
 
 	# and that its directories are available