Imported Debian patch 1.1.2-6

[nfs-utils.git] / debian / nfs-kernel-server.init

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 06c40e6da0b8985ffe3f55f498ba00a0a7a0b192..4c4205a1c57a862115a399926f7fb91e43adfadf 100644 (file)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -2,8 +2,8 @@
 
 ### BEGIN INIT INFO
 # Provides:          nfs-kernel-server
-# Required-Start:    nfs-common $portmap $time
-# Required-Stop:     $portmap $time
+# Required-Start:    $remote_fs nfs-common $portmap $time
+# Required-Stop:     $remote_fs nfs-common $portmap $time
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Kernel NFS server support
@@ -27,7 +27,6 @@ DEFAULTFILE=/etc/default/nfs-kernel-server
 RPCNFSDCOUNT=8
 RPCNFSDPRIORITY=0
 RPCMOUNTDOPTS=
-NEED_MOUNTD=yes
 NEED_SVCGSSD=no
 RPCSVCGSSDOPTS=
 PROCNFSD_MOUNTPOINT=/proc/fs/nfsd
@@ -115,14 +114,12 @@ case "$1" in
                        fi
                fi
 
-               if [ "$NEED_MOUNTD" != "no" ]; then
-                       log_progress_msg "mountd"
-                       start-stop-daemon --start --oknodo --quiet \
-                           --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
-                       if [ $? != 0 ]; then
-                               log_end_msg $?
-                               exit $?
-                       fi
+               log_progress_msg "mountd"
+               start-stop-daemon --start --oknodo --quiet \
+                   --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
+               if [ $? != 0 ]; then
+                       log_end_msg $?
+                       exit $?
                fi
 
                log_end_msg 0
@@ -134,14 +131,12 @@ case "$1" in
   stop)
        log_daemon_msg "Stopping $DESC"
 
-       if [ "$NEED_MOUNTD" != "no" ]; then
-               log_progress_msg "mountd"
-               start-stop-daemon --stop --oknodo --quiet \
-                   --name rpc.mountd --user 0
-               if [ $? != 0 ]; then
-                       log_end_msg $?
-                       exit $?
-               fi
+       log_progress_msg "mountd"
+       start-stop-daemon --stop --oknodo --quiet \
+           --name rpc.mountd --user 0
+       if [ $? != 0 ]; then
+               log_end_msg $?
+               exit $?
        fi
 
        if [ "$NEED_SVCGSSD" = "yes" ]; then