From: lon <lon>
Date: Thu, 7 Jun 2001 18:00:14 +0000 (+0000)
Subject: Fixes explicit path problem (since most logical directories are
X-Git-Tag: nfs-utils-0-3-2-pre7~6
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e23ec647cb219ec875f8e56cbc2b1d8cf4a9cacf;p=nfs-utils.git

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 65495e9..4517937 100755
--- a/etc/nodist/nfs-server
+++ b/etc/nodist/nfs-server
@@ -53,7 +53,9 @@ start)
     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