X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=etc%2Fredhat%2Fnfs.init;h=4ef8d4884cd73bd9c974c41669081cc76708dfa6;hp=a12e262290b3f140cd77c96a5f1d2fcdf81f2e5e;hb=3abfccd3e6d9d30c88132478ab2836ab1ffa0c5b;hpb=39c9d0020d5541bd52ee88c006e91407081dcb2e

diff --git a/etc/redhat/nfs.init b/etc/redhat/nfs.init
index a12e262..4ef8d48 100755
--- a/etc/redhat/nfs.init
+++ b/etc/redhat/nfs.init
@@ -27,30 +27,40 @@ fi
 [ -x /usr/sbin/exportfs ] || exit 0
 [ -s /etc/exports ] || exit 0
 
+RQUOTAD=`type -path rpc.rquotad`	# Remote quota server
+
 # Number of servers to be started up by default
 RPCNFSDCOUNT=8
-# No NFS V3.
-RPCMOUNTDOPTS="--no-nfs-version 3"
+# Default to NFS version 3.
+RPCMOUNTDOPTS=""
 
 # See how we were called.
 case "$1" in
   start)
 	# Start daemons.
 	action "Starting NFS services: " /usr/sbin/exportfs -r
-	echo -n "Starting NFS quotas: "
-	daemon rpc.rquotad
+	if [ -n "$RQUOTAD" ]; then
+		echo -n "Starting NFS quotas: "
+		daemon rpc.rquotad
+		echo
+	fi
+	echo -n "Starting NFS daemon: "
+	daemon rpc.nfsd $RPCNFSDCOUNT
 	echo
+
+	# Let's see if we support NFS version 3.
+	/usr/sbin/rpcinfo -u localhost nfs 3 &>/dev/null
+	if [ $? -ne 0 ]; then
+		RPCMOUNTDOPTS="--no-nfs-version 3"
+	fi
+
 	echo -n "Starting NFS mountd: "
 	daemon rpc.mountd $RPCMOUNTDOPTS
 	echo
-	echo -n "Starting NFS daemon: "
-	daemon rpc.nfsd $RPCNFSDCOUNT
-	echo
 	touch /var/lock/subsys/nfs
 	;;
   stop)
 	# Stop daemons.
-	action "Shutting down NFS services: " /usr/sbin/exportfs -au
 	echo -n "Shutting down NFS mountd: "
 	killproc rpc.mountd
 	echo
@@ -60,6 +70,9 @@ case "$1" in
 	echo -n "Shutting down NFS quotas: "
 	killproc rpc.rquotad
 	echo
+	# Do it the last so that clients can still access the server
+	# when the server is running.
+	action "Shutting down NFS services: " /usr/sbin/exportfs -au
 	rm -f /var/lock/subsys/nfs
 	;;
   status)