X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.postinst;h=7671c1578fef333d22169c4fd5e40e0d78b4ac2a;hp=ce8d59b24d2e3e1c6dadb26f73993f12bdb2cdd1;hb=32078903299012c3ddee8a55ef54eac359fa0516;hpb=832d49bf021104d1fd381c82df42b25533ee6b1c

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
old mode 100755
new mode 100644
index ce8d59b..7671c15
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -4,6 +4,9 @@
 
 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
+
 	update-rc.d nfs-common defaults 21 79 >/dev/null
 
 	if ! getent passwd statd >/dev/null; then
@@ -15,11 +18,18 @@ case "$1" in
                 rmdir --ignore-fail-on-non-empty /home/statd
             fi
 	fi
-	if [ "$2" = "" ] || dpkg --compare-versions "$2" lt 1:1.0.7-13; then
+	if [ "$2" = "" ] || dpkg --compare-versions "$2" lt 1:1.0.7-16; then
 	    chown statd /var/lib/nfs/sm \
 		/var/lib/nfs/sm.bak \
-		/var/lib/nfs/state \
-		/var/lib/nfs/rpc_pipefs
+		/var/lib/nfs/rpc_pipefs \
+		/var/lib/nfs
+            if [ -f /var/lib/nfs/state ]; then
+	        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