X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.postinst;h=96aa3912be4c7494f58125efaaa17af3457dcab9;hp=f556bc273519fc72c58dd2fb2abd5d83c1a0dcd2;hb=HEAD;hpb=d4c3e975f577ad0b8b43027b962a6ec1e73112b1

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
old mode 100755
new mode 100644
index f556bc2..96aa391
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -1,32 +1,44 @@
-#!/bin/sh -e
+#!/bin/sh
 
-#DEBHELPER#
+set -e
 
 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 ! getent passwd statd >/dev/null; then
-	    adduser --system --home /var/lib/nfs --no-create-home statd
-	fi
-	if dpkg --compare-versions "$2" ge 1:1.0.7-10 && dpkg --compare-versions "$2" lt 1:1.0.7-13; then
+        if [ "$2" != "" ] && dpkg --compare-versions "$2" lt 1:1.1.0-10; then
+            update-rc.d -f nfs-common remove >/dev/null
+        fi
+
+        if ! getent passwd statd >/dev/null; then
+            adduser --system --home /var/lib/nfs --no-create-home statd
+        fi
+        if dpkg --compare-versions "$2" ge 1:1.0.7-10 && dpkg --compare-versions "$2" lt 1:1.0.7-13; then
             usermod --home /var/lib/nfs statd || true
             if [ -d /home/statd ]; then
                 rmdir --ignore-fail-on-non-empty /home/statd
             fi
-	fi
-	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 \
-		/var/lib/nfs
-            if [ -f /var/lib/nfs/state ]; then
-	        chown statd /var/lib/nfs/state
+        fi
+
+        chown statd: /var/lib/nfs/sm \
+            /var/lib/nfs/sm.bak \
+            /var/lib/nfs
+        if [ -f /var/lib/nfs/state ]; then
+            chown statd /var/lib/nfs/state
+        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
+
+	# Migrate /lib/init/rw/sendsigs.omit.statd to /run.
+	if [ -f /lib/init/rw/sendsigs.omit.d/statd ]; then 
+	    mv /lib/init/rw/sendsigs.omit.d/statd /run/sendsigs.omit.d/statd
 	fi
     ;;
 esac
 
-act="restart"
-[ "$1:$2" = "configure:" ] && act="start"
-invoke-rc.d nfs-common $act
+#DEBHELPER#