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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index dc93bea..a0eab38 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
@@ -17,7 +17,6 @@ DESC="NFS common utilities"
 
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
-PREFIX=
 NEED_STATD=
 NEED_IDMAPD=
 NEED_GSSD=
@@ -30,7 +29,7 @@ fi
 . /lib/lsb/init-functions
 
 # Exit if required binaries are missing.
-[ -x $PREFIX/sbin/rpc.statd ] || exit 0
+[ -x /sbin/rpc.statd ] || exit 0
 
 #
 # Parse the fstab file, and determine whether we need idmapd and gssd. (The
@@ -45,9 +44,15 @@ if [ -f /etc/fstab ]; then
 
     while read DEV MTPT FSTYPE OPTS REST
     do
-        if [ "$FSTYPE" = "nfs4" ]; then
+	case $DEV in
+	    ''|\#*)
+		continue
+		;;
+	esac
+	# 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,*)
@@ -131,12 +136,29 @@ case "$1" in
 
 	if [ "$NEED_STATD" = yes ]; then
 	    log_progress_msg "statd"
+	    
+	    # 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 \
-	        --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
+		--pidfile /var/run/rpc.statd.pid \
+	        --exec /sbin/rpc.statd -- $STATDOPTS
 	    RET=$?
 	    if [ $RET != 0 ]; then
 	        log_end_msg $RET
 	        exit $RET
+	    else
+		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