X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=etc%2Fnodist%2Fnfs-server;h=8f1d34b63aad3a6a94db86bbb674a665ef7cb3b8;hp=65495e9f0ad9096973dafef987aa3871b2d081a9;hb=312181c3f67fdce2388f1f58cfc220c09b551c59;hpb=f5334de87490a151d58c3fadea0410b7046d5fe3

diff --git a/etc/nodist/nfs-server b/etc/nodist/nfs-server
index 65495e9..8f1d34b 100755
--- a/etc/nodist/nfs-server
+++ b/etc/nodist/nfs-server
@@ -53,10 +53,25 @@ 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
+    ClearAddr=
+    if [ -f /proc/net/rpc/auth.unix.ip/channel ] ; then
+      if   grep -s 127.0.0.1 /proc/net/rpc/auth.unix.ip/content > /dev/null ; then
+	     : address already known
+      else
+             echo nfsd 127.0.0.1 2147483647 localhost > /proc/net/rpc/auth.unix.ip/channel
+	     ClearAddr=
+      fi
+    fi
+    rpcinfo -u localhost nfs 3 &>/dev/null 
+    if [ "$?" != "0" ]
     then
         RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
     fi
+    if [ -n "$ClearAddr" ]; then
+          echo nfsd 127.0.0.1 1  > /proc/net/rpc/auth.unix.ip/channel
+    fi
+
     echo -n "Starting $MOUNTD: "
     startdaemon $MOUNTD $RPCMOUNTDOPTS