X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.postinst;h=2b838617c9c711da798cbdfec28ae7a52b353565;hp=162f3c30ef30db3fd51667de629b6157e8431d5f;hb=eb6377a236a5099f32fe9125e04d5eff3dacc2dd;hpb=0f0b74e909a9f6a0dcaff48c4ad110c3ea450ef0

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
old mode 100755
new mode 100644
index 162f3c3..2b83861
--- 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,7 +18,7 @@ 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/rpc_pipefs \