Fixes explicit path problem (since most logical directories are

specified above, we can just call rpcinfo instead of /usr/sbin/rpcinfo)

Also fixes the problem where we were disabling MNTv3 if NFSv3 _is_
present.

diff --git a/etc/nodist/nfs-server b/etc/nodist/nfs-server
index 65495e9f0ad9096973dafef987aa3871b2d081a9..4517937f586780be80fc95900fcd61f172cf663b 100755 (executable)
--- a/etc/nodist/nfs-server
+++ b/etc/nodist/nfs-server
@@ -53,7 +53,9 @@ start)
     echo -n "Starting $NFSD: "
     startdaemon $PREFIX$NFSD $RPCNFSDCOUNT
 
     echo -n "Starting $NFSD: "
     startdaemon $PREFIX$NFSD $RPCNFSDCOUNT
 

-    if /usr/sbin/rpcinfo -u localhost nfs 3 &>/dev/null 
+    # Disable NFSv3 on mountd if we don't have NFSv3
+    rpcinfo -u localhost nfs 3 &>/dev/null 
+    if [ "$?" != "0" ]

     then
         RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
     fi
     then
         RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
     fi