Only use rpcbind's rpcinfo when it's available

[nfs-utils.git] / debian / nfs-common.init

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 3364207f42d45cc1c1e81b40ecacdbf353b3f775..5e30d95998598f800ed10cb16ba46d43c95e84c5 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 ### BEGIN INIT INFO
 # Provides:          nfs-common
@@ -45,9 +45,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 +137,28 @@ 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 \
+               --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
 
@@ -149,6 +171,7 @@ case "$1" in
        then
            do_modprobe sunrpc
            do_modprobe nfs
+           do_modprobe nfsd
            if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
            then
                if [ "$NEED_IDMAPD" = yes ]