nfs-common.init: Enable idmapd by default (Closes: #610363)

diff --git a/debian/changelog b/debian/changelog
index a81a60414693d31dd7fe217078ce4ca37cf71b36..1e88225cf1430569a857ad3e5553782904547fa8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,9 @@ nfs-utils (1:1.2.3-1) unstable; urgency=low
     - Try to use kernel function to determine supported Kerberos 
       enctypes (258f10f) (Closes: #474037)
   * Make sure everything is shipped (inspired by #594933) 
+  * nfs-common.init: Enable idmapd by default (Closes: #610363)
 
- -- Luk Claes <luk@debian.org>  Mon, 21 Mar 2011 19:57:02 +0100
+ -- Luk Claes <luk@debian.org>  Mon, 21 Mar 2011 20:04:26 +0100
 
 nfs-utils (1:1.2.2-5) unstable; urgency=low
 

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 13aa9741ae53887f0f08ee699e79cc34ba23143c..f1fadeb522fb50449acac0d9183dd5b4ad401c6f 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -50,9 +50,10 @@ if [ -f /etc/fstab ]; then
                continue
                ;;
        esac
-        if [ "$FSTYPE" = "nfs4" ]; then
+       # FSTYPE "nfs" can be NFSv4 now
+        #if [ "$FSTYPE" = "nfs4" ]; then
             AUTO_NEED_IDMAPD=yes
-        fi
+        #fi
         case "$OPTS" in
 
             sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)