Imported Debian patch 1.0.10-6~quilt.1

[nfs-utils.git] / debian / nfs-common.postinst

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
old mode 100755 (executable)
new mode 100644 (file)
index ce8d59b..2b83861
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -4,6 +4,9 @@
 
 case "$1" in
     configure)
+       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
+
        update-rc.d nfs-common defaults 21 79 >/dev/null
 
        if ! getent passwd statd >/dev/null; then
@@ -15,11 +18,14 @@ 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/state \
-               /var/lib/nfs/rpc_pipefs
+               /var/lib/nfs/rpc_pipefs \
+               /var/lib/nfs
+            if [ -f /var/lib/nfs/state ]; then
+               chown statd /var/lib/nfs/state
+            fi
        fi
     ;;
 esac