From: Luk Claes <luk@debian.org>
Date: Wed, 13 Apr 2011 20:57:54 +0000 (+0200)
Subject: Use rpcinfo instead of /dev/tcp redirection
X-Git-Tag: debian/1%1.2.4-1~21
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f37bec7a1ad2b671af7272c2b869d4ee4e72957e;p=nfs-utils.git

Use rpcinfo instead of /dev/tcp redirection
---

diff --git a/debian/changelog b/debian/changelog
index 4b6d078..4f12e73 100644
--- 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 f1fadeb..e5c2a02 100644
--- 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 f9a385c..631e74e 100644
--- 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