Imported Debian patch 1.1.1-7

diff --git a/debian/changelog b/debian/changelog
index a9e506bfc449002bbe2ffb58a0501a4c8c0d0ddd..3f268883830e4a7a3b0688119170511eee21c33e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.1.1-7) unstable; urgency=low
+
+  * More init script breakage: Fix default value of NEED_STATD.
+    (Closes: #448688)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Wed, 31 Oct 2007 09:15:53 +0100
+
 nfs-utils (1:1.1.1-6) unstable; urgency=low
 
   * Fix typo in init script. (Closes: #448538, #448607, #448564)

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index c81edfb552b1b23aa88bb443b1dc60e21db62f41..0a018ccafc329e82a506357c739c1199389395c4 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -18,7 +18,7 @@ DESC="NFS common utilities"
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
 PREFIX=
-NEED_STATD=yes
+NEED_STATD=
 NEED_IDMAPD=
 NEED_GSSD=
 PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
@@ -49,6 +49,7 @@ if [ -f /etc/fstab ]; then
             AUTO_NEED_IDMAPD=yes
         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,*)
            AUTO_NEED_GSSD=yes
             ;;
@@ -71,6 +72,14 @@ if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then
     AUTO_NEED_IDMAPD=yes
 fi
 
+case "$NEED_STATD" in
+    yes|no)
+        ;;
+    *)
+        NEED_STATD=yes
+        ;;
+esac
+
 case "$NEED_IDMAPD" in
     yes|no)    
         ;;