X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-kernel-server.postinst;h=835a14fd457debe4c9ed5b937a8dea26c2600d03;hp=fa43e13a038e2bff459584ba46f7d7420dd38667;hb=cf68d913577423279082a85becffd0336e98fff2;hpb=d0131f1c645c57b914a38bbd7c651f3a546129ee

diff --git a/debian/nfs-kernel-server.postinst b/debian/nfs-kernel-server.postinst
old mode 100755
new mode 100644
index fa43e13..835a14f
--- a/debian/nfs-kernel-server.postinst
+++ b/debian/nfs-kernel-server.postinst
@@ -1,9 +1,14 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 #DEBHELPER#
 
 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
@@ -11,17 +16,10 @@ case "$1" in
 	done
 
 	update-rc.d nfs-kernel-server defaults 20 80 >/dev/null
-
-	# Remove obsolete debconf questions
-	if [ -e /usr/share/debconf/confmodule ]; then
-	    . /usr/share/debconf/confmodule
-	    db_unregister nfs-kernel-server/sync-default || true
-	    db_unregister nfs-kernel-server/tcpwrappers-mountd || true
-	    db_stop
-	fi
-	;;
+    ;;
 esac
 
 act="restart"
 [ "$1:$2" = "configure:" ] && act="start"
+[ "$1:$2" = "configure:" ] && invoke-rc.d nfs-common start
 invoke-rc.d nfs-kernel-server $act