Imported Debian patch 1.2.1-2

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

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 6e352c0f303a5e43eb9cbd455ce6161c5900c7f9..4291e09e8d38959a6373409de9ae02ab3c84acbe 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
@@ -64,7 +64,7 @@ case "$1" in
                do_modprobe nfsd
 
                # See if our running kernel supports the NFS kernel server
-               if [ -f /proc/kallsyms ] && ! grep -qE 'init_nf(sd|     )' /proc/kallsyms; then
+               if [ -f /proc/kallsyms ] && ! grep -Eqm1 ' nfsd_.* *\[nfsd\]' /proc/kallsyms; then
                        log_warning_msg "Not starting $DESC: no support in current kernel."
                        exit 0
                fi
@@ -72,9 +72,10 @@ case "$1" in
                do_mount nfsd $PROCNFSD_MOUNTPOINT || NEED_SVCGSSD=no
                log_begin_msg "Exporting directories for $DESC..."
                $PREFIX/sbin/exportfs -r
-               if [ $? != 0 ]; then
-                       log_end_msg $?
-                       exit $?
+               RET=$?
+               if [ $RET != 0 ]; then
+                       log_end_msg $RET
+                       exit $RET
                fi
                log_end_msg 0
 
@@ -83,9 +84,10 @@ case "$1" in
                start-stop-daemon --start --oknodo --quiet \
                    --nicelevel $RPCNFSDPRIORITY \
                    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
-               if [ $? != 0 ]; then
-                       log_end_msg $?
-                       exit $?
+               RET=$?
+               if [ $RET != 0 ]; then
+                       log_end_msg $RET
+                       exit $RET
                fi
 
                # make sure 127.0.0.1 is a valid source for requests
@@ -108,18 +110,20 @@ case "$1" in
                        log_progress_msg "svcgssd"
                        start-stop-daemon --start --oknodo --quiet \
                            --exec $PREFIX/sbin/rpc.svcgssd -- $RPCSVCGSSDOPTS
-                       if [ $? != 0 ]; then
-                               log_end_msg $?
-                               exit $?
+                       RET=$?
+                       if [ $RET != 0 ]; then
+                               log_end_msg $RET
+                               exit $RET
                        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 $?
+               RET=$?
+               if [ $RET != 0 ]; then
+                       log_end_msg $RET
+                       exit $RET
                fi
 
                log_end_msg 0
@@ -134,36 +138,40 @@ case "$1" in
        log_progress_msg "mountd"
        start-stop-daemon --stop --oknodo --quiet \
            --name rpc.mountd --user 0
-       if [ $? != 0 ]; then
-               log_end_msg $?
-               exit $?
+       RET=$?
+       if [ $RET != 0 ]; then
+               log_end_msg $RET
+               exit $RET
        fi
 
        if [ "$NEED_SVCGSSD" = "yes" ]; then
                log_progress_msg "svcgssd"
                start-stop-daemon --stop --oknodo --quiet \
                    --name rpc.svcgssd --user 0
-               if [ $? != 0 ]; then
-                       log_end_msg $?
-                       exit $?
+               RET=$?
+               if [ $RET != 0 ]; then
+                       log_end_msg $RET
+                       exit $RET
                fi
        fi
 
        log_progress_msg "nfsd"
        start-stop-daemon --stop --oknodo --quiet \
            --name nfsd --user 0 --signal 2
-       if [ $? != 0 ]; then
-               log_end_msg $?
-               exit $?
+       RET=$?
+       if [ $RET != 0 ]; then
+               log_end_msg $RET
+               exit $RET
        fi
 
        log_end_msg 0
 
        log_begin_msg "Unexporting directories for $DESC..."
        $PREFIX/sbin/exportfs -au
-       if [ $? != 0 ]; then
-               log_end_msg $?
-               exit $?
+       RET=$?
+       if [ $RET != 0 ]; then
+               log_end_msg $RET
+               exit $RET
        fi
        log_end_msg 0
 
@@ -187,8 +195,9 @@ case "$1" in
   reload | force-reload)
        log_begin_msg "Re-exporting directories for $DESC..."
        $PREFIX/sbin/exportfs -r
-       log_end_msg $?
-       exit $?
+       RET=$?
+       log_end_msg $RET
+       exit $RET
        ;;
 
   restart)