Imported Debian patch 1.1.0-10

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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index e9cb4cab899eb9874dd352f45ba4b169759bdc4e..54701d7d931a2dcb4aa370a7b9823f92af280fb7 100644 (file)
--- 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,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
@@ -29,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
@@ -59,21 +36,23 @@ 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
-
-exec 0<&9 9<&-
+    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
+
+    exec 0<&9 9<&-
+fi
 
 #
 # We also need idmapd if we run an NFSv4 server. It's fairly difficult
@@ -107,7 +86,6 @@ 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
 
@@ -152,16 +130,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
@@ -225,18 +193,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
@@ -264,15 +220,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