X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=25ff4f757c7314544a122eb1c0e06638dc19f863;hp=c6b0a9a284ca79a4baf7011b14c4f68a6d15fa63;hb=97820a9040bdfe3bccdbfc58b1df88883bba0abe;hpb=9ae0ab21cafe223226170d4c1a624f1c05685b02

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index c6b0a9a..25ff4f7 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 ### BEGIN INIT INFO
 # Provides:          nfs-common
-# Required-Start:    $time
+# Required-Start:    $portmap $time
 # Required-Stop:     $time
-# Default-Start:     2 3 4 5
+# Default-Start:     2 3 4 5 S
 # Default-Stop:      0 1 6
 # Short-Description: NFS support files common to client and server
 # Description:       NFS is a popular protocol for file sharing across
@@ -17,10 +17,9 @@ DESC="NFS common utilities"
 
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
-PREFIX=
-NEED_IDMAPD=
+NEED_STATD=
 NEED_GSSD=
-PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
+PIPEFS_MOUNTPOINT=/run/rpc_pipefs
 RPCGSSDOPTS=
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
@@ -28,49 +27,50 @@ fi
 
 . /lib/lsb/init-functions
 
+# Exit if required binaries are missing.
+[ -x /sbin/rpc.statd ] || exit 0
+
 #
-# Parse the fstab file, and determine whether we need idmapd and gssd. (The
+# Parse the fstab file, and determine whether we need gssd. (The
 # /etc/defaults settings, if any, will override our autodetection.) This code
 # is partially adapted from the mountnfs.sh script in the sysvinit package.
 #
-AUTO_NEED_IDMAPD=no
 AUTO_NEED_GSSD=no
 
-exec 9<&0 </etc/fstab
+if [ -f /etc/fstab ]; then
+    exec 9<&0 </etc/fstab
 
-while read DEV MTPT FSTYPE OPTS REST
-do
-    if [ "$FSTYPE" = "nfs4" ]; then
-        AUTO_NEED_IDMAPD=yes
-    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
-	;;
-    esac
-done
+    while read DEV MTPT FSTYPE OPTS REST
+    do
+	case $DEV in
+	    ''|\#*)
+		continue
+		;;
+	esac
+        case "$OPTS" in
 
-exec 0<&9 9<&-
+            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
+            ;;
+        esac
+    done
 
-#
-# We also need idmapd if we run an NFSv4 server. It's fairly difficult
-# to autodetect whether there are NFSv4 exports or not, and idmapd is not a
-# particularily heavy daemon, so we auto-enable it if we find an /etc/exports
-# file. This does not mean that there are NFSv4 or other mounts active (or
-# even that nfs-kernel-server is installed), but it matches what the "start"
-# condition in nfs-kernel-server's init script does, which has a value in
-# itself.
-#
-if [ -f /etc/exports ]; then
-    AUTO_NEED_IDMAPD=yes
+    exec 0<&9 9<&-
 fi
 
+case "$NEED_STATD" in
+    yes|no)
+        ;;
+    *)
+        NEED_STATD=yes
+        ;;
+esac
 
 case "$NEED_IDMAPD" in
     yes|no)	
         ;;
     *)
-        NEED_IDMAPD=$AUTO_NEED_IDMAPD
+        NEED_IDMAPD=yes
 	;;
 esac
 
@@ -82,11 +82,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
@@ -120,18 +115,45 @@ 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 /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
 
+	# 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
+	    mkdir -p "$PIPEFS_MOUNTPOINT"
 	    if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
 	    then
 	    	if [ "$NEED_IDMAPD" = yes ]
@@ -139,9 +161,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 ]
@@ -158,9 +181,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
@@ -176,9 +200,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 ]
@@ -186,34 +211,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
@@ -222,12 +255,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
 	;;