Imported Debian patch 1.0.7-15

diff --git a/debian/changelog b/debian/changelog
index f783345c1245faa1796d974394f1efbb0218d8a2..07aa32e50f537a277ca5698e5528513cfebb2ce8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nfs-utils (1:1.0.7-15) unstable; urgency=low
+
+  * /var/lib/nfs/state is not a directory; it shouldn't really be mkdir-ed
+    or chowned (unless it already exists, in which case it should be
+    chowned). However, /var/lib/nfs should be owned by statd, so it can
+    create the file there. (Really Closes: #366654)
+  * umount /var/lib/nfs/rpc_pipefs on /etc/init.d/nfs-common stop; not doing
+    so could prevent purging of nfs-common.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Thu, 11 May 2006 12:42:13 +0200
+
 nfs-utils (1:1.0.7-14) unstable; urgency=high
 
   * urgency=high; fixes RC bugs (or at least, bugs that should have been RC).

diff --git a/debian/nfs-common.dirs b/debian/nfs-common.dirs
index 06e9733ebf563c51970c23f16769c2fb680f8c8b..7dbf8aa24d2bdb9bbe7268162a94b2b47b8ca396 100644 (file)
--- a/debian/nfs-common.dirs
+++ b/debian/nfs-common.dirs
@@ -3,6 +3,5 @@ sbin
 usr/sbin
 var/lib/nfs
 var/lib/nfs/sm
-var/lib/nfs/state
 var/lib/nfs/sm.bak
 var/lib/nfs/rpc_pipefs

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 76ceaca2819ff141590043761fae63c09d21b17a..f90ee9a64467b2b7ba6b8592fd1bca2b9409ee9b 100755 (executable)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -113,6 +113,14 @@ do_mount() {
     return 0
 }
 
+do_umount() {
+    if mountpoint -q "$1"
+    then
+       umount "$1"
+    fi
+    return 0
+}
+
 # See how we were called.
 case "$1" in
   start)
@@ -180,6 +188,7 @@ case "$1" in
        printf " statd"
        start-stop-daemon --stop --oknodo --quiet \
            --name rpc.statd
+       do_umount $PIPEFS_MOUNTPOINT
        echo "."
        ;;
 

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index ce8d59b24d2e3e1c6dadb26f73993f12bdb2cdd1..162f3c30ef30db3fd51667de629b6157e8431d5f 100755 (executable)
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -18,8 +18,11 @@ case "$1" in
        if [ "$2" = "" ] || dpkg --compare-versions "$2" lt 1:1.0.7-13; 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