Use rpcinfo instead of /dev/tcp redirection

diff --git a/debian/changelog b/debian/changelog
index 4b6d078722d11bcee718115533a0341121d4abeb..4f12e7339a5e19d3393c3a9c696f27a705846b7e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ nfs-utils (1:1.2.3-3) UNRELEASED; urgency=low
     libtirpc-dev
   * Remove very old versioned dependencies on netbase and libblkid1
   * Exclude state files from dh_md5sum
+  * Use rpcinfo instead of /dev/tcp redirection
 
- -- Luk Claes <luk@debian.org>  Mon, 11 Apr 2011 18:06:40 +0200
+ -- Luk Claes <luk@debian.org>  Wed, 13 Apr 2011 22:54:50 +0200
 
 nfs-utils (1:1.2.3-2) unstable; urgency=low
 

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index f1fadeb522fb50449acac0d9183dd5b4ad401c6f..e5c2a0243b8d915f2e95a4e2ac2cec1c91fcf823 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -138,12 +138,12 @@ case "$1" in
        if [ "$NEED_STATD" = yes ]; then
            log_progress_msg "statd"
            
-           # See if portmap or rpcbind are running
-           (cat </dev/null >/dev/tcp/localhost/111) 2>/dev/null
+           # See if rpcbind is running
+           rpcinfo -p >/dev/null 2>&1
            RET=$?
            if [ $RET != 0 ]; then
                echo
-               log_warning_msg "Not starting: portmap daemon is not running"
+               log_warning_msg "Not starting: portmapper is not running"
                exit 0
            fi
 

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index f9a385c666c6123f73a8c9cfb75fa2433c8cd205..631e74edd56efb82a8513982d8f0b49752d9d589 100644 (file)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -83,12 +83,12 @@ case "$1" in
                log_daemon_msg "Starting $DESC"
                log_progress_msg "nfsd"
                
-               # See if portmap or rpcbind are running
-               (cat </dev/null >/dev/tcp/localhost/111) 2>/dev/null
+               # See if rpcbind is running
+               rpcinfo -p >/dev/null 2>&1
                RET=$?
                if [ $RET != 0 ]; then
                    echo
-                   log_warning_msg "Not starting: portmap daemon is not running"
+                   log_warning_msg "Not starting: portmapper is not running"
                    exit 0
                fi