Imported Debian patch 1.1.0~rc1-1

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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index a93097661f64d772b8b38052d1040cdd5d03a67f..c6b0a9a284ca79a4baf7011b14c4f68a6d15fa63 100644 (file)
--- 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,7 +18,6 @@ DESC="NFS common utilities"
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
 PREFIX=
-NEED_LOCKD=
 NEED_IDMAPD=
 NEED_GSSD=
 PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
@@ -28,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
@@ -106,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() {
@@ -148,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
@@ -178,6 +148,14 @@ 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 \
                            --exec /usr/sbin/rpc.gssd -- $RPCGSSDOPTS
                    if [ $? != 0 ]; then
@@ -213,18 +191,6 @@ case "$1" in
                 exit $?
             fi
        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 \
            --name rpc.statd
@@ -252,15 +218,6 @@ case "$1" in
            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