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

diff --git a/etc/redhat/nfs.init b/etc/redhat/nfs.init
index eb95a24..836d60d 100755
--- a/etc/redhat/nfs.init
+++ b/etc/redhat/nfs.init
@@ -29,8 +29,8 @@ fi
 
 # 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
@@ -40,12 +40,25 @@ case "$1" in
 	echo -n "Starting NFS quotas: "
 	daemon rpc.rquotad
 	echo
-	echo -n "Starting NFS mountd: "
-	daemon rpc.mountd $RPCMOUNTDOPTS
-	echo
 	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
+
+	# 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
 	touch /var/lock/subsys/nfs
 	;;
   stop)