From bc700ac52d47969d873499e3050d028335eda14d Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 1 Apr 2006 02:46:53 +0200 Subject: [PATCH] Imported Debian patch 1.0.7-6 --- debian/changelog | 16 ++++++++++++ debian/nfs-common.default | 10 +++++--- debian/nfs-common.dirs | 1 + debian/nfs-common.init | 46 +++++++++++++++++++++++++++++++++-- debian/nfs-kernel-server.dirs | 1 - debian/rules | 4 +-- 6 files changed, 70 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1c256fd..4d0cacf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +nfs-utils (1:1.0.7-6) unstable; urgency=low + + * Let the man-page fixup script in debian/rules look for the man pages in + the right place. + * Modprobe nfs4 along with nfs in the nfs-common init script. Also modprobe + rpcsec_gss_krb5 before we start gssd. + * Implement autodetection for NEED_IDMAPD and NEED_GSSD, based on /etc/fstab. + * Add a note to the top of /etc/defaults/nfs-common that the default is to + autodetect. + * Move /var/lib/nfs/rpc_pipefs from nfs-kernel-server.dirs to + nfs-common.dirs; it's needed by the client as well. + * Let dh_install install from debian/tmp/ instead of debian/tmp; it fixes + minor aesthetic issues in the build log. + + -- Steinar H. Gunderson Sat, 1 Apr 2006 02:46:53 +0200 + nfs-utils (1:1.0.7-5) unstable; urgency=low * Non-non-maintainer-upload this time, it seems. :-) diff --git a/debian/nfs-common.default b/debian/nfs-common.default index a8287de..0a5e8b2 100644 --- a/debian/nfs-common.default +++ b/debian/nfs-common.default @@ -1,3 +1,7 @@ +# If you do not set values for the NEED_ options, they will be attempted +# autodetected; this should be sufficient for most people. Valid alternatives +# for the NEED_ options are "yes" and "no". + # Options for rpc.statd. # Should rpc.statd listen on a specific port? # If so, set this variable to a statd argument like: "--port 1000". @@ -8,9 +12,9 @@ STATDOPTS= NEED_LOCKD= # If you are not using NFSv4 and wish to disable the idmapd daemon, -# then set NEED_IDMAPD to "no". -NEED_IDMAPD=no +# then set NEED_IDMAPD to "no". +NEED_IDMAPD= # If you are not running NFS with RPCSEC_GSS security, and wish to # disable the gssd client daemon, then set NEED_GSSD to "no". -NEED_GSSD=no +NEED_GSSD= diff --git a/debian/nfs-common.dirs b/debian/nfs-common.dirs index 653a4e0..7dbf8aa 100644 --- a/debian/nfs-common.dirs +++ b/debian/nfs-common.dirs @@ -4,3 +4,4 @@ usr/sbin var/lib/nfs var/lib/nfs/sm var/lib/nfs/sm.bak +var/lib/nfs/rpc_pipefs diff --git a/debian/nfs-common.init b/debian/nfs-common.init index 0f25166..76ceaca 100755 --- a/debian/nfs-common.init +++ b/debian/nfs-common.init @@ -18,9 +18,9 @@ DESC="NFS common utilities" DEFAULTFILE=/etc/default/nfs-common PREFIX= NEED_LOCKD= -NEED_IDMAPD=yes +NEED_IDMAPD= IDMAPD_PIDFILE=/var/run/rpc.idmapd.pid -NEED_GSSD=yes +NEED_GSSD= GSSD_PIDFILE=/var/run/rpc.gssd.pid PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs RPCGSSDOPTS= @@ -50,6 +50,46 @@ yes|no) ;; ;; esac +# +# Parse the fstab file, and determine whether we need idmapd and gssd. (The +# /etc/defaults settings, if any, will override our autodetection.) This code +# is partially adapted from the mountnfs.sh script in the sysvinit package. +# +AUTO_NEED_IDMAPD=no +AUTO_NEED_GSSD=no + +exec 9<&0