X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fnfs-common.init;h=d69eb34a9f3c410e5f6154f9936172a8d714319f;hb=cb76955caa903c2894491bdec6a0e6fd9c8c87a0;hp=0a018ccafc329e82a506357c739c1199389395c4;hpb=35bc75f6a00cf684b2c65703a0ce3aa46dad31db;p=nfs-utils.git

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 0a018cc..d69eb34 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
+	    lsof -i :111 >/dev/null
+	    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
 
@@ -147,8 +167,9 @@ case "$1" in
 
 	if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
 	then
+	    do_modprobe sunrpc
 	    do_modprobe nfs
-	    do_modprobe nfs4
+	    do_modprobe nfsd
 	    if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
 	    then
 	    	if [ "$NEED_IDMAPD" = yes ]