X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=59fc59df6fecad7429ec9b24a762a5b72675630e;hp=2ae17b3e1b165b263a1ee9948275291ac021250e;hb=b7f4ad19f9b3b8e0f93da719a86d0e865be5ab75;hpb=edfedfb53af585792ec6796ead7b0cc5f13618aa

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 2ae17b3..59fc59d 100755
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -9,26 +9,45 @@
 #	       locking functionality.
 #
 
-PREFIX=
+set -e
 
-# Should rpc.statd listen on a specific port?
-# If so, set this variable to a statd argument like: "--port 1000".
-STATDPORT=""
+# What is this?
+DESC="NFS common utilities"
 
-NEED_LOCKD=yes
-if test -f /proc/ksyms
-then
-    # We need to be conservative and run lockd,
-    # unless we can prove that it isn't required.
-    grep -q lockdctl /proc/ksyms || NEED_LOCKD=no
+# Read config
+DEFAULTFILE=/etc/default/nfs-common
+PREFIX=
+NEED_LOCKD=
+if [ -f $DEFAULTFILE ]; then
+    . $DEFAULTFILE
 fi
 
+# 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
 [ -x $PREFIX/sbin/rpc.lockd ] || [ "$NEED_LOCKD" = no ] || exit 0
 
-# What is this?
-DESC="NFS common utilities"
-
 # See how we were called.
 case "$1" in
   start)
@@ -36,12 +55,12 @@ case "$1" in
 	printf "Starting $DESC:"
 	printf " statd"
 	start-stop-daemon --start --quiet \
-	    --exec $PREFIX/sbin/rpc.statd -- $STATDPORT
+	    --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
 	if [ "$NEED_LOCKD" = yes ]
 	then
 	    printf " lockd"
 	    start-stop-daemon --start --quiet \
-		--exec $PREFIX/sbin/rpc.lockd
+		--exec $PREFIX/sbin/rpc.lockd  || true
 	fi
 	echo "."
 	;;
@@ -52,7 +71,7 @@ case "$1" in
 	then
 	    printf " lockd"
 	    start-stop-daemon --stop --oknodo --quiet \
-		--name rpc.lockd --user 0
+		--name rpc.lockd --user 0  || true
 	fi
 	printf " statd"
 	start-stop-daemon --stop --oknodo --quiet \