X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-kernel-server.init;h=4291e09e8d38959a6373409de9ae02ab3c84acbe;hp=06c40e6da0b8985ffe3f55f498ba00a0a7a0b192;hb=7f1928b63d65cece25a445f9813a25e84893e08c;hpb=636f3185bd6b6bd214d64a8fd196f909268e2719

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 06c40e6..4291e09 100644
--- 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
@@ -65,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
@@ -73,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
 
@@ -84,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
@@ -109,20 +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
 
-		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
+		RET=$?
+		if [ $RET != 0 ]; then
+			log_end_msg $RET
+			exit $RET
 		fi
 
 		log_end_msg 0
@@ -134,41 +135,43 @@ 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
+	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
 
@@ -192,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)