From e2a06505dd907443476dac5d74b0989fe3c96877 Mon Sep 17 00:00:00 2001 From: Anibal Monsalve Salazar Date: Tue, 13 Jul 2010 15:20:17 +1000 Subject: [PATCH] Imported Debian patch 1.2.2-2 --- debian/changelog | 9 ++++++--- debian/control | 2 +- debian/nfs-common.postinst | 41 +++++++++++++++++++------------------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2333ba1..7ee9cf3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,14 @@ -nfs-utils (1:1.2.2-1.1) unstable; urgency=low +nfs-utils (1:1.2.2-2) unstable; urgency=low - * Non-maintainer upload. + [ Vagrant Cascadian ] * Ensure files under /var/lib/nfs/ are owned by statd user. Closes: #574510 - -- Vagrant Cascadian Mon, 12 Jul 2010 20:52:13 +0000 + [ Anibal Monsalve Salazar ] + * Fix out-of-date-standards-version + -- Anibal Monsalve Salazar Tue, 13 Jul 2010 15:20:17 +1000 + nfs-utils (1:1.2.2-1) unstable; urgency=low [ Anibal Monsalve Salazar ] diff --git a/debian/control b/debian/control index 71511e7..7961fef 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Section: net Maintainer: Debian kernel team Uploaders: Anibal Monsalve Salazar , Ben Hutchings Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssglue-dev, librpcsecgss-dev (>= 0.17), libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Homepage: http://nfs.sourceforge.net/ Package: nfs-kernel-server diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst index e7d9451..013e3c8 100644 --- a/debian/nfs-common.postinst +++ b/debian/nfs-common.postinst @@ -6,36 +6,37 @@ set -e case "$1" in configure) - ucf --three-way /usr/share/nfs-common/conffiles/idmapd.conf /etc/idmapd.conf - ucf --three-way /usr/share/nfs-common/conffiles/nfs-common.default /etc/default/nfs-common + ucf --three-way /usr/share/nfs-common/conffiles/idmapd.conf /etc/idmapd.conf + ucf --three-way /usr/share/nfs-common/conffiles/nfs-common.default /etc/default/nfs-common if [ "$2" != "" ] && dpkg --compare-versions "$2" lt 1:1.1.0-10; then update-rc.d -f nfs-common remove >/dev/null - fi - update-rc.d nfs-common start 20 2 3 4 5 . stop 20 0 1 6 . start 44 S . >/dev/null + fi + update-rc.d nfs-common start 20 2 3 4 5 . stop 20 0 1 6 . start 44 S . >/dev/null - if ! getent passwd statd >/dev/null; then - adduser --system --home /var/lib/nfs --no-create-home statd - fi - if dpkg --compare-versions "$2" ge 1:1.0.7-10 && dpkg --compare-versions "$2" lt 1:1.0.7-13; then + if ! getent passwd statd >/dev/null; then + adduser --system --home /var/lib/nfs --no-create-home statd + fi + if dpkg --compare-versions "$2" ge 1:1.0.7-10 && dpkg --compare-versions "$2" lt 1:1.0.7-13; then usermod --home /var/lib/nfs statd || true if [ -d /home/statd ]; then rmdir --ignore-fail-on-non-empty /home/statd fi - fi - chown statd /var/lib/nfs/sm \ - /var/lib/nfs/sm.bak \ - /var/lib/nfs/rpc_pipefs \ - /var/lib/nfs + fi + + chown statd /var/lib/nfs/sm \ + /var/lib/nfs/sm.bak \ + /var/lib/nfs/rpc_pipefs \ + /var/lib/nfs if [ -f /var/lib/nfs/state ]; then - chown statd /var/lib/nfs/state + chown statd /var/lib/nfs/state + fi + + if [ "$2" != "" ] || dpkg --compare-versions "$2" lt 1:1.1.0-14; then + if dpkg-statoverride --list /sbin/mount.nfs >/dev/null 2>&1; then + dpkg-statoverride --remove /sbin/mount.nfs + fi fi - - if [ "$2" != "" ] || dpkg --compare-versions "$2" lt 1:1.1.0-14; then - if dpkg-statoverride --list /sbin/mount.nfs >/dev/null 2>&1; then - dpkg-statoverride --remove /sbin/mount.nfs - fi - fi ;; esac -- 2.39.2