Use rpcbind's rpcinfo everywhere (Closes: #707589).

diff --git a/debian/changelog b/debian/changelog
index 2aba5b44234fac21e8e07956435f239f765b138e..f3c52d95dfd061ca67681d6bfde8a810b73f24d5 100644 (file)
--- 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).
 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 4076e31c66ecdc98aefe2d10807f76440e6f6304..a0eab38795cef1a93796c11a4de89eff45027b1a 100644 (file)
--- 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
 
 # Read config
 DEFAULTFILE=/etc/default/nfs-common

-PREFIX=

 NEED_STATD=
 NEED_IDMAPD=
 NEED_GSSD=
 NEED_STATD=
 NEED_IDMAPD=
 NEED_GSSD=


@@ -30,7 +29,7 @@ fi
 . /lib/lsb/init-functions
 
 # Exit if required binaries are missing.
 . /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
 
 #
 # 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 \
            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
            RET=$?
            if [ $RET != 0 ]; then
                log_end_msg $RET

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index d00b2ec4fbe238a4a1e68867b068d97fde3f321b..7ce79f5a814a33d351b5abb9eeb8cf678a6eb234 100644 (file)
--- 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
                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
                RET=$?
                if [ $RET != 0 ]; then
                    echo


@@ -117,7 +117,7 @@ case "$1" in
                    }
                fi
 
                    }
                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
                    RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
 
                [ -z "$ClearAddr" ] || echo "nfsd 127.0.0.1 1" >/proc/net/rpc/auth.unix.ip/channel