From 84f550655f0df432d49dacbad87492061f481369 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Thu, 27 Apr 2006 00:32:27 +0200 Subject: [PATCH] Imported Debian patch 1.0.7-10 --- confdefs.h | 4 ++++ debian/changelog | 17 +++++++++++++++++ debian/control | 2 +- debian/nfs-common.default | 10 ++++------ debian/nfs-common.postinst | 22 +++++++++------------- debian/nfs-common.prerm | 2 +- debian/nfs-kernel-server.prerm | 2 +- 7 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 confdefs.h diff --git a/confdefs.h b/confdefs.h new file mode 100644 index 0000000..0010349 --- /dev/null +++ b/confdefs.h @@ -0,0 +1,4 @@ + +#define NFS3_SUPPORTED 1 +#define NFS4_SUPPORTED 1 +#define GSS_SUPPORTED 1 diff --git a/debian/changelog b/debian/changelog index 5b74a34..57ad8c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +nfs-utils (1:1.0.7-10) unstable; urgency=low + + * Intermediate 1.0.7 release, waiting for librpcsecgss to be uploaded into + Debian so we can upload 1.0.8. + * Clarify what the NEED_* options in /etc/default/nfs-common mean. + (Closes: #364625) + * Make /var/lib/nfs/{sm,sm.bak,state,rpc_pipefs} be owned by a new "statd" + user (created in postinst), causing rpc.statd to be run as that user + instead of root. (Closes: #240689) + * Make nfs-common depend on adduser. + * Clear out obsolete (pre-sarge) debconf and rc.d purging from postinst + script. + * Use invoke-rc.d in nfs-common and nfs-kernel-server prerms instead of + calling the /etc/init.d script directly; fixes two lintian warnings. + + -- Steinar H. Gunderson Thu, 27 Apr 2006 00:32:27 +0200 + nfs-utils (1:1.0.7-9) unstable; urgency=low * When checking for nfsd support in the kernel, check for init_nfsd diff --git a/debian/control b/debian/control index d4283b9..e7f80f9 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Description: Kernel NFS server support Package: nfs-common Architecture: any -Depends: portmap, sysvinit (>= 2.80-1), ${shlibs:Depends} +Depends: portmap, sysvinit (>= 2.80-1), adduser, ${shlibs:Depends} Provides: nfs-client Conflicts: nfs-client Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5) diff --git a/debian/nfs-common.default b/debian/nfs-common.default index 0a5e8b2..89f9980 100644 --- a/debian/nfs-common.default +++ b/debian/nfs-common.default @@ -7,14 +7,12 @@ # If so, set this variable to a statd argument like: "--port 1000". STATDOPTS= -# Are you _sure_ that your kernel does or does not need a lockd daemon? -# If so, set this variable to either "yes" or "no". +# Some kernels need a separate lockd daemon; most don't. Set this if you +# want to force an explicit choice for some reason. NEED_LOCKD= -# If you are not using NFSv4 and wish to disable the idmapd daemon, -# then set NEED_IDMAPD to "no". +# Do you want to start the idmapd daemon? It is only needed for NFSv4. 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". +# Do you want to start the gssd daemon? It is required for Kerberos mounts. NEED_GSSD= diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst index 5af4731..8648d03 100755 --- a/debian/nfs-common.postinst +++ b/debian/nfs-common.postinst @@ -4,22 +4,18 @@ case "$1" in configure) - if [ "$2" != "" -a "$2" != "" ] \ - && dpkg --compare-versions "$2" lt "1:1.0-3" \ - || ( dpkg --compare-versions "$2" ge "1:1.0.1" \ - && dpkg --compare-versions "$2" lt "1:1.0.2-1" ) - then - update-rc.d -f nfs-common remove >/dev/null 2>&1 || true - fi update-rc.d nfs-common defaults 21 79 >/dev/null - # Remove obsolete debconf questions - if [ -e /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - db_unregister nfs-common/tcpwrappers-statd || true - db_stop + if ! getent passwd statd >/dev/null; then + adduser --system statd + fi + if [ "$2" = "" ] || dpkg --compare-versions "$2" lt 1.0.7-10; then + chown statd /var/lib/nfs/sm \ + /var/lib/nfs/sm.bak \ + /var/lib/nfs/state \ + /var/lib/nfs/rpc_pipefs fi - ;; + ;; esac act="restart" diff --git a/debian/nfs-common.prerm b/debian/nfs-common.prerm index b49a2b4..c3c15ba 100755 --- a/debian/nfs-common.prerm +++ b/debian/nfs-common.prerm @@ -5,7 +5,7 @@ case "$1" in remove|purge) [ -x /etc/init.d/nfs-common ] && - /etc/init.d/nfs-common stop + invoke-rc.d nfs-common stop ;; esac diff --git a/debian/nfs-kernel-server.prerm b/debian/nfs-kernel-server.prerm index d82bd10..80878e6 100755 --- a/debian/nfs-kernel-server.prerm +++ b/debian/nfs-kernel-server.prerm @@ -5,7 +5,7 @@ case "$1" in remove|purge) [ -x /etc/init.d/nfs-kernel-server ] && - /etc/init.d/nfs-kernel-server stop + invoke-rc.d nfs-kernel-server stop ;; esac -- 2.39.2