Imported Debian patch 1.1.1-4

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

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 81bd3f230a810fef8d9c001b15b014a93b0d438d..06c40e6da0b8985ffe3f55f498ba00a0a7a0b192 100644 (file)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -2,7 +2,8 @@
 
 ### BEGIN INIT INFO
 # Provides:          nfs-kernel-server
-# Required-Start:    $portmap $time
+# Required-Start:    nfs-common $portmap $time
+# Required-Stop:     $portmap $time
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Kernel NFS server support
@@ -26,6 +27,7 @@ DEFAULTFILE=/etc/default/nfs-kernel-server
 RPCNFSDCOUNT=8
 RPCNFSDPRIORITY=0
 RPCMOUNTDOPTS=
+NEED_MOUNTD=yes
 NEED_SVCGSSD=no
 RPCSVCGSSDOPTS=
 PROCNFSD_MOUNTPOINT=/proc/fs/nfsd
@@ -103,6 +105,7 @@ case "$1" in
                [ -z "$ClearAddr" ] || echo "nfsd 127.0.0.1 1" >/proc/net/rpc/auth.unix.ip/channel
        
                if [ "$NEED_SVCGSSD" = "yes" ]; then
+                       do_modprobe rpcsec_gss_krb5
                        log_progress_msg "svcgssd"
                        start-stop-daemon --start --oknodo --quiet \
                            --exec $PREFIX/sbin/rpc.svcgssd -- $RPCSVCGSSDOPTS
@@ -112,12 +115,14 @@ case "$1" in
                        fi
                fi
 
-               log_progress_msg "mountd"
-               start-stop-daemon --start --oknodo --quiet \
-                   --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
-               if [ $? != 0 ]; then
-                       log_end_msg $?
-                       exit $?
+               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
                fi
 
                log_end_msg 0
@@ -128,15 +133,17 @@ case "$1" in
 
   stop)
        log_daemon_msg "Stopping $DESC"
-       
-       log_progress_msg "mountd"
-       start-stop-daemon --stop --oknodo --quiet \
-           --name rpc.mountd --user 0
-       if [ $? != 0 ]; then
-               log_end_msg $?
-               exit $?
+
+       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
        fi
-               
+
        if [ "$NEED_SVCGSSD" = "yes" ]; then
                log_progress_msg "svcgssd"
                start-stop-daemon --stop --oknodo --quiet \
@@ -165,7 +172,7 @@ case "$1" in
        fi
        log_end_msg 0
 
-       if mountpoint -q /proc/nfs/nfsd
+       if mountpoint -q $PROCNFSD_MOUNTPOINT
        then
            $PREFIX/sbin/exportfs -f
        fi