X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=902741014447dc3db7b190c7eb7ffb43e42c6f4b;hp=13aa9741ae53887f0f08ee699e79cc34ba23143c;hb=0e6df494958aa3d975cca4e972c32de0b1733def;hpb=b28a50b0f9f5b32dfca23ff3bec6da0fe17d4219

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 13aa974..9027410 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -50,9 +50,10 @@ if [ -f /etc/fstab ]; then
 		continue
 		;;
 	esac
-        if [ "$FSTYPE" = "nfs4" ]; then
+	# FSTYPE "nfs" can be NFSv4 now
+        #if [ "$FSTYPE" = "nfs4" ]; then
             AUTO_NEED_IDMAPD=yes
-        fi
+        #fi
         case "$OPTS" in
 
             sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
@@ -137,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
+	    /usr/sbin/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