X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=4076e31c66ecdc98aefe2d10807f76440e6f6304;hp=13aa9741ae53887f0f08ee699e79cc34ba23143c;hb=5af2f5885d1152218ffa81995e6b25ee3dc8f71a;hpb=38861db18a0687aaf483ea0bf03bf8c928ca0980

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 13aa974..4076e31 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,15 +138,16 @@ 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
-	    RET=$?
-	    if [ $RET != 0 ]; then
-		echo
-		log_warning_msg "Not starting: portmap daemon is not running"
-		exit 0
+	    # See if rpcbind is running
+	    if [ -x /usr/sbin/rpcinfo ]; then
+		/usr/sbin/rpcinfo -p >/dev/null 2>&1
+		RET=$?
+		if [ $RET != 0 ]; then
+		   echo
+		   log_warning_msg "Not starting: portmapper is not running"
+		   exit 0
+		fi
 	    fi
-
 	    start-stop-daemon --start --oknodo --quiet \
 		--pidfile /var/run/rpc.statd.pid \
 	        --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
@@ -154,9 +156,10 @@ case "$1" in
 	        log_end_msg $RET
 	        exit $RET
 	    else
-		mkdir -p /lib/init/rw/sendsigs.omit.d
-		rm -f /lib/init/rw/sendsigs.omit.d/statd
-		ln -s /var/run/rpc.statd.pid /lib/init/rw/sendsigs.omit.d/statd
+		if [ -d /run/sendsigs.omit.d ]; then
+		    rm -f /run/sendsigs.omit.d/statd
+		    ln -s /var/run/rpc.statd.pid /run/sendsigs.omit.d/statd
+		fi
 	    fi
 	fi