X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=etc%2Fredhat%2Fnfs.init;h=406fef14000b78a5732c326644a32b5e997ea358;hb=4f152504e44e75d77be302d830b87cf463df9b33;hp=a66761914eef4d1be2a13000706a7647b6ada506;hpb=313c1662bb9dfd8094de0cc4666b03f1b9e89d22;p=nfs-utils.git

diff --git a/etc/redhat/nfs.init b/etc/redhat/nfs.init
index a667619..406fef1 100755
--- a/etc/redhat/nfs.init
+++ b/etc/redhat/nfs.init
@@ -27,27 +27,36 @@ 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.
-	echo -n "Starting NFS quotas: "
-	daemon rpc.rquotad
+	action "Starting NFS services: " /usr/sbin/exportfs -r
+	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
-	# Do it the last so that all clients mounting points are
-	# exported. FIXME: Why?
-	action "Starting NFS services: " /usr/sbin/exportfs -r
 	touch /var/lock/subsys/nfs
 	;;
   stop)
@@ -58,9 +67,11 @@ case "$1" in
 	echo -n "Shutting down NFS daemon: "
 	killproc nfsd
 	echo
-	echo -n "Shutting down NFS quotas: "
-	killproc rpc.rquotad
-	echo
+	if [ -n "$RQUOTAD" ]; then
+		echo -n "Shutting down NFS quotas: "
+		killproc rpc.rquotad
+		echo
+	fi
 	# 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
@@ -69,7 +80,9 @@ case "$1" in
   status)
 	status rpc.mountd
 	status nfsd
-	status rpc.rquotad
+	if [ -n "$RQUOTAD" ]; then
+		status rpc.rquotad
+	fi
 	;;
   restart)
 	$0 stop