X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fnfs-common.init;h=f1fadeb522fb50449acac0d9183dd5b4ad401c6f;hb=7666ed1f9728ae51ed00ccdbb388f99fb09d153f;hp=92ea10d8b8eee1657616ceee39c1fde11892234c;hpb=c315741380515fe31cbf34960208420efe443069;p=nfs-utils.git

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 92ea10d..f1fadeb 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 ### BEGIN INIT INFO
 # Provides:          nfs-common
@@ -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