rpc.mountd nfs version detection

diff --git a/ChangeLog b/ChangeLog
index 0f30fc041e5183b470d5de40c1ecce5a3111647a..45e7d4121d7f8f42076f7a6a1eac50ac5c30dccc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-01  Jay Weber <jweber@valinux.com>
+
+       * etc/redhat/nfs.init: Added ability for rpc.mountd to default to
+       supporting version 3 of nfs if available, else it will fall back to
+       version 2 support only.
+
 2000-08-30  H.J. Lu <hjl@lucon.org>
 
        * configure.in (VERSION): Set to "0.2".

diff --git a/etc/redhat/nfs.init b/etc/redhat/nfs.init
index eb95a24b29873d0063dfc8f8de3b1255edac2cd4..5a40f4f8f454b5f9717f0e80a41a705a142febee 100755 (executable)
--- 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,19 @@ 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
+
+       echo -n "Starting NFS mountd: "
+       daemon rpc.mountd $RPCMOUNTDOPTS
+       echo
        touch /var/lock/subsys/nfs
        ;;
   stop)