X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fnfs-common.init;h=f1fadeb522fb50449acac0d9183dd5b4ad401c6f;hb=f632a622cd10047926b691771bbb7212b0a2a1ba;hp=18a4fddb4684b2c4e0d8947fe494a728a156957d;hpb=da2897639a8b455d58977d37b16458faeffae5f8;p=nfs-utils.git

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 18a4fdd..f1fadeb 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,*)
@@ -138,7 +139,7 @@ case "$1" in
 	    log_progress_msg "statd"
 	    
 	    # See if portmap or rpcbind are running
-	    cat </dev/null >/dev/tcp/localhost/111
+	    (cat </dev/null >/dev/tcp/localhost/111) 2>/dev/null
 	    RET=$?
 	    if [ $RET != 0 ]; then
 		echo