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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 5c34c9e..c6b0a9a 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -3,6 +3,7 @@
 ### BEGIN INIT INFO
 # Provides:          nfs-common
 # Required-Start:    $time
+# Required-Stop:     $time
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: NFS support files common to client and server
@@ -17,11 +18,8 @@ DESC="NFS common utilities"
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
 PREFIX=
-NEED_LOCKD=
 NEED_IDMAPD=
-IDMAPD_PIDFILE=/var/run/rpc.idmapd.pid
 NEED_GSSD=
-GSSD_PIDFILE=/var/run/rpc.gssd.pid
 PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
 RPCGSSDOPTS=
 if [ -f $DEFAULTFILE ]; then
@@ -30,28 +28,6 @@ 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
-
 #
 # Parse the fstab file, and determine whether we need idmapd and gssd. (The
 # /etc/defaults settings, if any, will override our autodetection.) This code
@@ -76,6 +52,20 @@ done
 
 exec 0<&9 9<&-
 
+#
+# 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
+fi
+
+
 case "$NEED_IDMAPD" in
     yes|no)	
         ;;
@@ -94,12 +84,14 @@ 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() {
-    modprobe -q "$1" || true
+    if [ -x /sbin/modprobe -a -f /proc/modules ]
+    then
+        modprobe -q "$1" || true
+    fi
 }
 
 do_mount() {
@@ -136,16 +128,6 @@ case "$1" in
 	    exit $?
 	fi
 
-	if [ "$NEED_LOCKD" = yes ]
-	then
-	    log_progress_msg "lockd"
-	    start-stop-daemon --start --oknodo --quiet \
-		--exec $PREFIX/sbin/rpc.lockd
-	    if [ $? != 0 ]; then
-	        log_end_msg $?
-	        exit $?
-            fi
-	fi
 	if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
 	then
 	    do_modprobe nfs
@@ -156,7 +138,6 @@ case "$1" in
 		then
 	            log_progress_msg "idmapd"
 		    start-stop-daemon --start --oknodo --quiet \
-			    --make-pidfile --pidfile $IDMAPD_PIDFILE \
 			    --exec /usr/sbin/rpc.idmapd
 	            if [ $? != 0 ]; then
         	        log_end_msg $?
@@ -167,8 +148,15 @@ case "$1" in
 		then
 		    do_modprobe rpcsec_gss_krb5
 	            log_progress_msg "gssd"
+
+	            # we need this available; better to fail now than
+		    # mysteriously on the first mount
+		    if ! grep -q -E '^nfs[	 ]' /etc/services; then
+		    	log_action_end_msg 1 "broken /etc/services, please see /usr/share/doc/nfs-common/README.Debian.nfsv4"
+			exit 1
+		    fi
+
 		    start-stop-daemon --start --oknodo --quiet \
-			    --make-pidfile --pidfile $GSSD_PIDFILE \
 			    --exec /usr/sbin/rpc.gssd -- $RPCGSSDOPTS
 	            if [ $? != 0 ]; then
         	        log_end_msg $?
@@ -192,7 +180,6 @@ case "$1" in
                 log_end_msg $?
                 exit $?
             fi
-	    rm -f $GSSD_PIDFILE
 	fi
 	if [ "$NEED_IDMAPD" = yes ]
 	then
@@ -203,19 +190,6 @@ case "$1" in
                 log_end_msg $?
                 exit $?
             fi
-	    rm -f $IDMAPD_PIDFILE
-	fi
-	if [ "$NEED_LOCKD" = yes ]
-	then
-	    log_progress_msg "lockd"
-	    start-stop-daemon --stop --oknodo --quiet \
-		--name rpc.lockd
-	    if [ $? != 0 ]; then
-                log_end_msg $?
-                exit $?
-            fi
-	else
-	    pkill -KILL -u root -x lockd || true
 	fi
 	log_progress_msg "statd"
 	start-stop-daemon --stop --oknodo --quiet \
@@ -237,25 +211,16 @@ case "$1" in
 
 	if [ "$NEED_GSSD" = yes ]
 	then
-            if [ ! -f "$GSSD_PIDFILE" ] || ! pidof rpc.gssd >/dev/null
+            if ! pidof rpc.gssd >/dev/null
 	    then
 		echo "rpc.statd running, but rpc.gssd halted"
 		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 [ ! -f "$IDMAPD_PIDFILE" ] || ! pidof rpc.idmapd >/dev/null
+            if ! pidof rpc.idmapd >/dev/null
 	    then
 		echo "rpc.statd running, but rpc.idmapd halted"
 		exit 3