X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-kernel-server.postinst;h=a25c22c2ff4f802920ab4efdecc1f3edfd8cd401;hp=a523cc781445842eba5472a82cd38df9158cd5de;hb=ba45c291a064c3623b6de1ea660c482467df97df;hpb=24725201e1abc88e5e8859f8ece4a1dce1432d06

diff --git a/debian/nfs-kernel-server.postinst b/debian/nfs-kernel-server.postinst
old mode 100755
new mode 100644
index a523cc7..a25c22c
--- a/debian/nfs-kernel-server.postinst
+++ b/debian/nfs-kernel-server.postinst
@@ -1,35 +1,24 @@
-#!/bin/sh -e
+#!/bin/sh
 
-#DEBHELPER#
+set -e
 
-. /usr/share/debconf/confmodule
+#DEBHELPER#
 
 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
+	for f in /var/lib/nfs/etab  \
+		 /var/lib/nfs/rmtab \
+		 /var/lib/nfs/xtab; do
+	    [ -e $f ] || touch $f
+	done
 
-	# 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
-
-	update-rc.d nfs-kernel-server defaults 20 80 >/dev/null 2>&1
-	;;
+	update-rc.d nfs-kernel-server defaults 20 80 >/dev/null
+    ;;
 esac
 
-db_stop
-
-/etc/init.d/nfs-kernel-server start
+act="restart"
+[ "$1:$2" = "configure:" ] && act="start"
+invoke-rc.d nfs-kernel-server $act