X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fnfs-common.init;h=5e30d95998598f800ed10cb16ba46d43c95e84c5;hb=c5c49e89770fc7aaa093f336ef0b43cf84c891dd;hp=90ac6af379cc48c7f7ef471ef8d571e20515df1e;hpb=f922408f8d40b2ac947b05f5249f80ed84c88240;p=nfs-utils.git

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 90ac6af..5e30d95 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,*)
@@ -137,15 +138,16 @@ case "$1" in
 	if [ "$NEED_STATD" = yes ]; then
 	    log_progress_msg "statd"
 	    
-	    # See if portmap or rpcbind are running
-	    lsof -i :111 >/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
@@ -153,6 +155,10 @@ case "$1" in
 	    if [ $RET != 0 ]; then
 	        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
 	    fi
 	fi