X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=dc93bea0846a3a13f080b793259339b26982ab19;hp=e9cb4cab899eb9874dd352f45ba4b169759bdc4e;hb=2dd083c5bdb5b38729b46dc65c886c77aa5a82b9;hpb=1b0d7cf30d55019c4fcabb25c04ee61352e5666d

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index e9cb4ca..dc93bea 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -2,9 +2,9 @@
 
 ### 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
@@ -18,7 +18,7 @@ DESC="NFS common utilities"
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
 PREFIX=
-NEED_LOCKD=
+NEED_STATD=
 NEED_IDMAPD=
 NEED_GSSD=
 PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
@@ -29,27 +29,8 @@ fi
 
 . /lib/lsb/init-functions
 
-# Determine whether lockd daemon is required.
-case "$NEED_LOCKD" in
-yes|no)	;;
-*)  case `uname -r` in
-    '' | [01].* | 2.[0123].* )
-	# Older kernels may or may not need a lockd daemon.
-	# We must assume they do, unless we can prove otherwise.
-	# (A false positive here results only in a harmless message.)
-	NEED_LOCKD=yes
-	if test -f /proc/ksyms
-	then
-	    grep -q lockdctl /proc/ksyms || NEED_LOCKD=no
-	fi
-	;;
-
-    *)  # Modern kernels (>= 2.4) start a lockd thread automatically.
-	NEED_LOCKD=no
-	;;
-    esac
-    ;;
-esac
+# 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
@@ -59,21 +40,24 @@ esac
 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
+        if [ "$FSTYPE" = "nfs4" ]; then
+            AUTO_NEED_IDMAPD=yes
+        fi
+        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
+
+    exec 0<&9 9<&-
+fi
 
 #
 # We also need idmapd if we run an NFSv4 server. It's fairly difficult
@@ -84,10 +68,17 @@ exec 0<&9 9<&-
 # 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)	
@@ -105,12 +96,6 @@ case "$NEED_GSSD" in
 	;;
 esac
 
-# Exit if required binaries are missing.
-[ -x $PREFIX/sbin/rpc.statd ] || exit 0
-[ -x $PREFIX/sbin/rpc.lockd ] || [ "$NEED_LOCKD"  = no ] || 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
@@ -144,28 +129,27 @@ 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 $?
-	fi
-
-	if [ "$NEED_LOCKD" = yes ]
-	then
-	    log_progress_msg "lockd"
+	if [ "$NEED_STATD" = yes ]; then
+	    log_progress_msg "statd"
 	    start-stop-daemon --start --oknodo --quiet \
-		--exec $PREFIX/sbin/rpc.lockd
-	    if [ $? != 0 ]; then
-	        log_end_msg $?
-	        exit $?
-            fi
+	        --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
+	    RET=$?
+	    if [ $RET != 0 ]; then
+	        log_end_msg $RET
+	        exit $RET
+	    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 ]
@@ -173,9 +157,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 ]
@@ -192,9 +177,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
@@ -210,9 +196,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 ]
@@ -220,69 +207,56 @@ 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_LOCKD" = yes ]
+	if [ "$NEED_STATD" = yes ]
 	then
-	    log_progress_msg "lockd"
+	    log_progress_msg "statd"
 	    start-stop-daemon --stop --oknodo --quiet \
-		--name rpc.lockd
-	    if [ $? != 0 ]; then
-                log_end_msg $?
-                exit $?
+	        --name rpc.statd
+	    RET=$?
+	    if [ $RET != 0 ]; then
+                log_end_msg $RET
+                exit $RET
             fi
-	else
-	    pkill -KILL -u root -x lockd || true
 	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
 
-	if [ "$NEED_LOCKD" = yes ]
-	then
-	    if ! pidof rpc.lockd >/dev/null
-	    then
-		echo "rpc.statd running, but rpc.lockd halted"
-		exit 3
-	    fi
-	fi
-	    
 	if [ "$NEED_IDMAPD" = yes ]
 	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
 	;;