From 35bc75f6a00cf684b2c65703a0ce3aa46dad31db Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Wed, 31 Oct 2007 09:15:53 +0100 Subject: [PATCH] Imported Debian patch 1.1.1-7 --- debian/changelog | 7 +++++++ debian/nfs-common.init | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a9e506b..3f26888 100644 --- 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 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 c81edfb..0a018cc 100644 --- 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) ;; -- 2.39.2