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 3cbb3229a54a9938e941d377b86b76c1bf676a72..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
@@ -18,7 +18,7 @@ DESC="NFS common utilities"
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
 PREFIX=
-NEED_STATD=yes
+NEED_STATD=
 NEED_IDMAPD=
 NEED_GSSD=
 PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
@@ -45,10 +45,17 @@ 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,*)
            AUTO_NEED_GSSD=yes
             ;;
@@ -71,6 +78,14 @@ if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then
     AUTO_NEED_IDMAPD=yes
 fi
 
+case "$NEED_STATD" in
+    yes|no)
+        ;;
+    *)
+        NEED_STATD=yes
+        ;;
+esac
+
 case "$NEED_IDMAPD" in
     yes|no)    
         ;;
@@ -122,11 +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
-           if [ $? != 0 ]; then
-               log_end_msg $?
-               exit $?
+           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
 
@@ -137,8 +169,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 ]
@@ -146,9 +179,10 @@ case "$1" in
                    log_progress_msg "idmapd"
                    start-stop-daemon --start --oknodo --quiet \
                            --exec /usr/sbin/rpc.idmapd
-                   if [ $? != 0 ]; then
-                       log_end_msg $?
-                       exit $?
+                   RET=$?
+                   if [ $RET != 0 ]; then
+                       log_end_msg $RET
+                       exit $RET
                     fi
                fi
                if [ "$NEED_GSSD" = yes ]
@@ -165,9 +199,10 @@ case "$1" in
 
                    start-stop-daemon --start --oknodo --quiet \
                            --exec /usr/sbin/rpc.gssd -- $RPCGSSDOPTS
-                   if [ $? != 0 ]; then
-                       log_end_msg $?
-                       exit $?
+                   RET=$?
+                   if [ $RET != 0 ]; then
+                       log_end_msg $RET
+                       exit $RET
                     fi
                fi
            fi
@@ -183,9 +218,10 @@ case "$1" in
            log_progress_msg "gssd"
            start-stop-daemon --stop --oknodo --quiet \
                    --name rpc.gssd
-           if [ $? != 0 ]; then
-                log_end_msg $?
-                exit $?
+           RET=$?
+           if [ $RET != 0 ]; then
+                log_end_msg $RET
+                exit $RET
             fi
        fi
        if [ "$NEED_IDMAPD" = yes ]
@@ -193,19 +229,21 @@ case "$1" in
            log_progress_msg "idmapd"
            start-stop-daemon --stop --oknodo --quiet \
                --name rpc.idmapd
-           if [ $? != 0 ]; then
-                log_end_msg $?
-                exit $?
+            RET=$?
+           if [ $RET != 0 ]; then
+                log_end_msg $RET
+                exit $RET
             fi
        fi
-       if ["$NEED_STATD" = yes ]
+       if [ "$NEED_STATD" = yes ]
        then
            log_progress_msg "statd"
            start-stop-daemon --stop --oknodo --quiet \
                --name rpc.statd
-           if [ $? != 0 ]; then
-                log_end_msg $?
-                exit $?
+           RET=$?
+           if [ $RET != 0 ]; then
+                log_end_msg $RET
+                exit $RET
             fi
        fi
        do_umount $PIPEFS_MOUNTPOINT 2>/dev/null || true