debian/nfs-kernel-server.init: don't try to check for nfsv3 configuration in nfsd...

diff --git a/debian/changelog b/debian/changelog
index e243a7a8d94d161b3e484445208b5908b7364754..fb13057c0558643eef198e354bda8a149e8b4f82 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,11 @@ nfs-utils (1:1.2.8-6) UNRELEASED; urgency=medium
   * Tweak nfs-common preinst to not remove nfs state files except on package
     removal (i.e., these should not be removed when the package is
     deconfigured temporarily).
+  * debian/nfs-kernel-server.init: don't try to check for nfsv3 configuration
+    in nfsd and pass --no-nfs-version 3 to mountd if absent; the check is
+    buggy and impossible to make reliable, and there's no reason to single
+    out NFSv3 here (and the original rationale for this behavior is lost).
+    Closes LP: #897644, LP: #1284210.
 
  -- Steve Langasek <vorlon@debian.org>  Mon, 13 Jan 2014 22:19:43 +0000
 

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 7ce79f5a814a33d351b5abb9eeb8cf678a6eb234..e0c51d6b778cbc53599f177f01b2ca8a0ba5b819 100644 (file)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -117,9 +117,6 @@ case "$1" in
                    }
                fi
 
-               $PREFIX/sbin/rpcinfo -u localhost nfs 3 >/dev/null 2>&1 ||
-                   RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
-
                [ -z "$ClearAddr" ] || echo "nfsd 127.0.0.1 1" >/proc/net/rpc/auth.unix.ip/channel
        
                if [ "$NEED_SVCGSSD" = "yes" ]; then