Imported Debian patch 1.0.7-17

diff --git a/debian/changelog b/debian/changelog
index 445388656860828c34f89b11a1d85dff36ef2e25..640cbe3f1bc1fb7db60ac9aba8dbd10d1cf24747 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nfs-utils (1:1.0.7-17) unstable; urgency=low
+
+  * The umounting of rpc_pipefs is non-critical and will fail if there are
+    any active NFS mounts during, say, a restart. Thus, send its stderr to
+    /dev/null, and ignore its error status.
+  * Build-Depend on perl, as it's used in debian/rules.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sun, 14 May 2006 18:22:19 +0200
+

 nfs-utils (1:1.0.7-16) unstable; urgency=high
 
   * urgency=high; fixes an RC bug.
 nfs-utils (1:1.0.7-16) unstable; urgency=high
 
   * urgency=high; fixes an RC bug.

diff --git a/debian/control b/debian/control
index e42d7cb3746f44492c97f7daac168093950100fe..3f43754f89010d8ce2f7b034bb8aa590a62eef5e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: standard
 Section: net
 Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Uploaders: Steinar H. Gunderson <sesse@debian.org>, Daniel Baumann <daniel.baumann@panthera-systems.net>
 Section: net
 Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Uploaders: Steinar H. Gunderson <sesse@debian.org>, Daniel Baumann <daniel.baumann@panthera-systems.net>

-Build-Depends: debhelper (>= 5), autoconf2.13, autotools-dev, libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev
+Build-Depends: debhelper (>= 5), autoconf2.13, autotools-dev, libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, perl

 Standards-Version: 3.7.2
 
 Package: nfs-kernel-server
 Standards-Version: 3.7.2
 
 Package: nfs-kernel-server

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index f90ee9a64467b2b7ba6b8592fd1bca2b9409ee9b..df5fca289018993800860d35a89e9a8c446dfcae 100755 (executable)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -188,7 +188,7 @@ case "$1" in
        printf " statd"
        start-stop-daemon --stop --oknodo --quiet \
            --name rpc.statd
        printf " statd"
        start-stop-daemon --stop --oknodo --quiet \
            --name rpc.statd

-       do_umount $PIPEFS_MOUNTPOINT
+       do_umount $PIPEFS_MOUNTPOINT 2>/dev/null || true

        echo "."
        ;;
 
        echo "."
        ;;