Imported Debian patch 1.1.0-10

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

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
old mode 100755 (executable)
new mode 100644 (file)
index c9055dc..1c988d5
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -5,10 +5,12 @@
 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/gssapi_mech.conf /etc/gssapi_mech.conf
        ucf --three-way /usr/share/nfs-common/conffiles/nfs-common.default /etc/default/nfs-common
 
-       update-rc.d nfs-common defaults 21 79 >/dev/null
+        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
 
        if ! getent passwd statd >/dev/null; then
            adduser --system --home /var/lib/nfs --no-create-home statd
@@ -28,6 +30,10 @@ 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
+       fi
     ;;
 esac