X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=etc%2Fredhat%2Fnfs.init;h=4ef8d4884cd73bd9c974c41669081cc76708dfa6;hb=51560d4104d03ce4584f7ca45f66587525e7419a;hp=836d60de4e7ed479aef9b67405e11324962e09c0;hpb=df07daea1421c80ecf308a6daf3ab3fa7d4cfd65;p=nfs-utils.git

diff --git a/etc/redhat/nfs.init b/etc/redhat/nfs.init
index 836d60d..4ef8d48 100755
--- a/etc/redhat/nfs.init
+++ b/etc/redhat/nfs.init
@@ -27,6 +27,8 @@ 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
 # Default to NFS version 3.
@@ -37,9 +39,11 @@ case "$1" in
   start)
 	# Start daemons.
 	action "Starting NFS services: " /usr/sbin/exportfs -r
-	echo -n "Starting NFS quotas: "
-	daemon rpc.rquotad
-	echo
+	if [ -n "$RQUOTAD" ]; then
+		echo -n "Starting NFS quotas: "
+		daemon rpc.rquotad
+		echo
+	fi
 	echo -n "Starting NFS daemon: "
 	daemon rpc.nfsd $RPCNFSDCOUNT
 	echo
@@ -50,12 +54,6 @@ case "$1" in
 		RPCMOUNTDOPTS="--no-nfs-version 3"
 	fi
 
-	# Let's see if we support NFS version 3.
-	/usr/sbin/rpcinfo -p localhost | grep nfs | grep tcp &>/dev/null
-	if [ $? -ne 0 ]; then
-		RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-tcp"
-	fi
-
 	echo -n "Starting NFS mountd: "
 	daemon rpc.mountd $RPCMOUNTDOPTS
 	echo