Don't start the nfs-common init script from the nfs-kernel-server maintainer script...

[nfs-utils.git] / debian / nfs-kernel-server.postinst

diff --git a/debian/nfs-kernel-server.postinst b/debian/nfs-kernel-server.postinst
old mode 100755 (executable)
new mode 100644 (file)
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