X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=5e30d95998598f800ed10cb16ba46d43c95e84c5;hp=54701d7d931a2dcb4aa370a7b9823f92af280fb7;hb=4e01e0a096880cbff37ba542a66838b3115355bc;hpb=59840096395f070e67af445e509037ef565520d0 diff --git a/debian/nfs-common.init b/debian/nfs-common.init index 54701d7..5e30d95 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 @@ -18,6 +18,7 @@ DESC="NFS common utilities" # Read config DEFAULTFILE=/etc/default/nfs-common PREFIX= +NEED_STATD= NEED_IDMAPD= NEED_GSSD= PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs @@ -28,6 +29,9 @@ fi . /lib/lsb/init-functions +# Exit if required binaries are missing. +[ -x $PREFIX/sbin/rpc.statd ] || exit 0 + # # Parse the fstab file, and determine whether we need idmapd and gssd. (The # /etc/defaults settings, if any, will override our autodetection.) This code @@ -41,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 ;; @@ -63,10 +74,17 @@ fi # condition in nfs-kernel-server's init script does, which has a value in # itself. # -if [ -f /etc/exports ]; then +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) @@ -84,11 +102,6 @@ case "$NEED_GSSD" in ;; esac -# Exit if required binaries are missing. -[ -x $PREFIX/sbin/rpc.statd ] || exit 0 -[ -x /usr/sbin/rpc.idmapd ] || [ "$NEED_IDMAPD" = no ] || exit 0 -[ -x /usr/sbin/rpc.gssd ] || [ "$NEED_GSSD" = no ] || exit 0 - do_modprobe() { if [ -x /sbin/modprobe -a -f /proc/modules ] then @@ -122,18 +135,43 @@ case "$1" in start) log_daemon_msg "Starting $DESC" - log_progress_msg "statd" - start-stop-daemon --start --oknodo --quiet \ - --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS - if [ $? != 0 ]; then - log_end_msg $? - exit $? + 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 + # Don't start idmapd and gssd if we don't have them (say, if /usr is not + # up yet). + [ -x /usr/sbin/rpc.idmapd ] || NEED_IDMAPD=no + [ -x /usr/sbin/rpc.gssd ] || NEED_GSSD=no + 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 ] @@ -141,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 ] @@ -160,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 @@ -178,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 ] @@ -188,34 +229,42 @@ 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 ] + then + log_progress_msg "statd" + start-stop-daemon --stop --oknodo --quiet \ + --name rpc.statd + RET=$? + if [ $RET != 0 ]; then + log_end_msg $RET + exit $RET fi fi - log_progress_msg "statd" - start-stop-daemon --stop --oknodo --quiet \ - --name rpc.statd - if [ $? != 0 ]; then - log_end_msg $? - exit $? - fi do_umount $PIPEFS_MOUNTPOINT 2>/dev/null || true log_end_msg 0 ;; status) - if ! pidof rpc.statd >/dev/null + if [ "$NEED_STATD" = yes ] then - echo "rpc.statd not running" - exit 3 + if ! pidof rpc.statd >/dev/null + then + echo "rpc.statd not running" + exit 3 + fi fi if [ "$NEED_GSSD" = yes ] then if ! pidof rpc.gssd >/dev/null then - echo "rpc.statd running, but rpc.gssd halted" + echo "rpc.gssd not running" exit 3 fi fi @@ -224,12 +273,12 @@ case "$1" in then if ! pidof rpc.idmapd >/dev/null then - echo "rpc.statd running, but rpc.idmapd halted" + echo "rpc.idmapd not running" exit 3 fi fi - echo "rpc.statd running" + echo "all daemons running" exit 0 ;;