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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index f1fadeb..4076e31 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -138,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
@@ -155,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