X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.postinst;h=d39b00304417ddc7bbbcf25784f6722ebdc1e536;hp=162f3c30ef30db3fd51667de629b6157e8431d5f;hb=7f1928b63d65cece25a445f9813a25e84893e08c;hpb=0f0b74e909a9f6a0dcaff48c4ad110c3ea450ef0

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
old mode 100755
new mode 100644
index 162f3c3..d39b003
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -1,10 +1,18 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 #DEBHELPER#
 
 case "$1" in
     configure)
-	update-rc.d nfs-common defaults 21 79 >/dev/null
+	ucf --three-way /usr/share/nfs-common/conffiles/idmapd.conf /etc/idmapd.conf
+	ucf --three-way /usr/share/nfs-common/conffiles/nfs-common.default /etc/default/nfs-common
+
+        if [ "$2" != "" ] && dpkg --compare-versions "$2" lt 1:1.1.0-10; then
+            update-rc.d -f nfs-common remove >/dev/null
+	fi
+	update-rc.d nfs-common start 20 2 3 4 5 . stop 20 0 1 6 . start 44 S . >/dev/null
 
 	if ! getent passwd statd >/dev/null; then
 	    adduser --system --home /var/lib/nfs --no-create-home statd
@@ -15,7 +23,7 @@ case "$1" in
                 rmdir --ignore-fail-on-non-empty /home/statd
             fi
 	fi
-	if [ "$2" = "" ] || dpkg --compare-versions "$2" lt 1:1.0.7-13; then
+	if [ "$2" = "" ] || dpkg --compare-versions "$2" lt 1:1.0.7-16; then
 	    chown statd /var/lib/nfs/sm \
 		/var/lib/nfs/sm.bak \
 		/var/lib/nfs/rpc_pipefs \
@@ -24,6 +32,12 @@ case "$1" in
 	        chown statd /var/lib/nfs/state
             fi
 	fi
+	
+	if [ "$2" != "" ] || dpkg --compare-versions "$2" lt 1:1.1.0-14; then
+	    if dpkg-statoverride --list /sbin/mount.nfs >/dev/null 2>&1; then
+	        dpkg-statoverride --remove /sbin/mount.nfs
+	    fi
+	fi
     ;;
 esac