From d3143a07f71a7177aca9391dcf50be46ef9d5eea Mon Sep 17 00:00:00 2001
From: Luk Claes <luk@debian.org>
Date: Fri, 10 May 2013 09:15:26 +0200
Subject: [PATCH] Use rpcbind's rpcinfo everywhere (Closes: #707589).

---
 debian/changelog              | 6 ++++++
 debian/nfs-common.init        | 5 ++---
 debian/nfs-kernel-server.init | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2aba5b4..f3c52d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nfs-utils (1:1.2.6-4) UNRELEASED; urgency=low
+
+  * Use rpcbind's rpcinfo everywhere (Closes: #707589).
+
+ -- Luk Claes <luk@zomers.be>  Fri, 10 May 2013 09:08:08 +0200
+
 nfs-utils (1:1.2.6-3) unstable; urgency=low
 
   * Iterate through exports.d to look for expors (Closes: #676604).
diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 4076e31..a0eab38 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -17,7 +17,6 @@ DESC="NFS common utilities"
 
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
-PREFIX=
 NEED_STATD=
 NEED_IDMAPD=
 NEED_GSSD=
@@ -30,7 +29,7 @@ fi
 . /lib/lsb/init-functions
 
 # Exit if required binaries are missing.
-[ -x $PREFIX/sbin/rpc.statd ] || exit 0
+[ -x /sbin/rpc.statd ] || exit 0
 
 #
 # Parse the fstab file, and determine whether we need idmapd and gssd. (The
@@ -150,7 +149,7 @@ case "$1" in
 	    fi
 	    start-stop-daemon --start --oknodo --quiet \
 		--pidfile /var/run/rpc.statd.pid \
-	        --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
+	        --exec /sbin/rpc.statd -- $STATDOPTS
 	    RET=$?
 	    if [ $RET != 0 ]; then
 	        log_end_msg $RET
diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index d00b2ec..7ce79f5 100644
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -90,7 +90,7 @@ case "$1" in
 		log_progress_msg "nfsd"
 		
 		# See if rpcbind is running
-		/usr/sbin/rpcinfo -p >/dev/null 2>&1
+		$PREFIX/sbin/rpcinfo -p >/dev/null 2>&1
 		RET=$?
 		if [ $RET != 0 ]; then
 		    echo
@@ -117,7 +117,7 @@ case "$1" in
 		    }
 		fi
 
-		$PREFIX/bin/rpcinfo -u localhost nfs 3 >/dev/null 2>&1 ||
+		$PREFIX/sbin/rpcinfo -u localhost nfs 3 >/dev/null 2>&1 ||
 		    RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
 
 		[ -z "$ClearAddr" ] || echo "nfsd 127.0.0.1 1" >/proc/net/rpc/auth.unix.ip/channel
-- 
2.39.2