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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index dc93bea..92ea10d 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -45,6 +45,11 @@ if [ -f /etc/fstab ]; then
 
     while read DEV MTPT FSTYPE OPTS REST
     do
+	case $DEV in
+	    ''|\#*)
+		continue
+		;;
+	esac
         if [ "$FSTYPE" = "nfs4" ]; then
             AUTO_NEED_IDMAPD=yes
         fi
@@ -131,12 +136,27 @@ 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
+	    RET=$?
+	    if [ $RET != 0 ]; then
+		echo
+		log_warning_msg "Not starting: portmap daemon is not running"
+		exit 0
+	    fi
+
 	    start-stop-daemon --start --oknodo --quiet \
+		--pidfile /var/run/rpc.statd.pid \
 	        --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
 	    RET=$?
 	    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