Imported Debian patch 1.2.1-2

[nfs-utils.git] / debian / nfs-common.postinst

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index 136ac9dbf00377bfe3a2053920a478b0c517602b..d39b00304417ddc7bbbcf25784f6722ebdc1e536 100644 (file)
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 #DEBHELPER#
 
@@ -7,10 +9,10 @@ case "$1" in
        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-8; then
+        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 defaults 20 79 >/dev/null
+       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
@@ -30,9 +32,11 @@ case "$1" in
                chown statd /var/lib/nfs/state
             fi
        fi
-
-       if ! dpkg-statoverride --list /sbin/mount.nfs >/dev/null 2>&1; then
-           dpkg-statoverride --update --add root root 4755 /sbin/mount.nfs
+       
+       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