From: Steinar H. Gunderson <sesse@debian.org>
Date: Sun, 14 May 2006 16:22:19 +0000 (+0200)
Subject: Imported Debian patch 1.0.7-17
X-Git-Tag: debian/1%1.0.7-17^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=a844d5c56ef076c8961e7396b601e9a2bdeb546f;p=nfs-utils.git

Imported Debian patch 1.0.7-17
---

diff --git a/debian/changelog b/debian/changelog
index 4453886..640cbe3 100644
--- 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.
diff --git a/debian/control b/debian/control
index e42d7cb..3f43754 100644
--- 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>
-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
diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index f90ee9a..df5fca2 100755
--- 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
-	do_umount $PIPEFS_MOUNTPOINT
+	do_umount $PIPEFS_MOUNTPOINT 2>/dev/null || true
 	echo "."
 	;;