Imported Debian patch 1.0.10-2

[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 fa43e13..5788144
--- 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
@@ -11,17 +14,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