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

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
old mode 100755
new mode 100644
index f556bc2..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