Use kernel version to short-circuit the lockd test in nfs-common.init.

[nfs-utils.git] / debian / nfs-common.init

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 78edad134214dc75313490e179067785ccb0301d..59fc59df6fecad7429ec9b24a762a5b72675630e 100755 (executable)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -9,22 +9,45 @@
 #             locking functionality.
 #
 
-PREFIX=
+set -e
+
+# 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)
@@ -32,12 +55,12 @@ case "$1" in
        printf "Starting $DESC:"
        printf " statd"
        start-stop-daemon --start --quiet \
-           --exec $PREFIX/sbin/rpc.statd
+           --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 "."
        ;;
@@ -48,11 +71,11 @@ case "$1" in
        then
            printf " lockd"
            start-stop-daemon --stop --oknodo --quiet \
-               --exec $PREFIX/sbin/rpc.lockd
+               --name rpc.lockd --user 0  || true
        fi
        printf " statd"
        start-stop-daemon --stop --oknodo --quiet \
-           --exec $PREFIX/sbin/rpc.statd
+           --name rpc.statd --user 0
        echo "."
        ;;