X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=debian%2Fnfs-kernel-server.postinst;h=c8b244dde88436ec3a2609876498955da5acc2a3;hb=5c3ed18c263cd01878d0314763d670a05d5ac284;hp=fa43e13a038e2bff459584ba46f7d7420dd38667;hpb=e7c106f6008ab11558e595585fb72872b21ae624;p=nfs-utils.git

diff --git a/debian/nfs-kernel-server.postinst b/debian/nfs-kernel-server.postinst
old mode 100755
new mode 100644
index fa43e13..c8b244d
--- a/debian/nfs-kernel-server.postinst
+++ b/debian/nfs-kernel-server.postinst
@@ -4,6 +4,9 @@
 
 case "$1" in
     configure)
+	ucf --three-way /usr/share/nfs-kernel-server/conffiles/etc.exports /etc/exports
+	ucf --three-way /usr/share/nfs-kernel-server/conffiles/nfs-kernel-server.default /etc/default/nfs-kernel-server
+
 	for f in /var/lib/nfs/etab  \
 		 /var/lib/nfs/rmtab \
 		 /var/lib/nfs/xtab; do