Imported Debian patch 1.1.0-7

[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..7671c15
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -5,7 +5,6 @@
 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
@@ -28,6 +27,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