X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-kernel-server.postinst;h=57881448d92929c44b56f1e668564e9b9ebdf2cd;hp=4bef32204ac3b4c0876eb7ec70a56f8aa675e4c1;hb=ad7dd95f8e6b93b2db436e3131ca42e4a623d306;hpb=e2d471f26fe47530d1d8fee9fdf1330203d458bc

diff --git a/debian/nfs-kernel-server.postinst b/debian/nfs-kernel-server.postinst
old mode 100755
new mode 100644
index 4bef322..5788144
--- a/debian/nfs-kernel-server.postinst
+++ b/debian/nfs-kernel-server.postinst
@@ -2,36 +2,22 @@
 
 #DEBHELPER#
 
-. /usr/share/debconf/confmodule
-
 case "$1" in
     configure)
-	db_get nfs-kernel-server/tcpwrappers-mountd || true
-
-	touch /var/lib/nfs/etab  \
-              /var/lib/nfs/rmtab \
-              /var/lib/nfs/xtab
+	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
 
-	if test -s /etc/exports
-	then
-	    : do nothing
-	else
-	    cat <<EOF >/etc/exports
-# /etc/exports: the access control list for filesystems which may be exported
-#		to NFS clients.  See exports(5).
-EOF
-	fi
-
-	# The old nfs-server's init script can't tell that it's been
-	# removed, so we have to kill the symlinks to it.
-	update-rc.d -f nfs-server remove >/dev/null
+	for f in /var/lib/nfs/etab  \
+		 /var/lib/nfs/rmtab \
+		 /var/lib/nfs/xtab; do
+	    [ -e $f ] || touch $f
+	done
 
 	update-rc.d nfs-kernel-server defaults 20 80 >/dev/null
-	;;
+    ;;
 esac
 
-db_stop
-
 act="restart"
 [ "$1:$2" = "configure:" ] && act="start"
+[ "$1:$2" = "configure:" ] && invoke-rc.d nfs-common start
 invoke-rc.d nfs-kernel-server $act