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=fb85f6c11772bb7f36eb57f3e904598c82615190;hb=7f1928b63d65cece25a445f9813a25e84893e08c;hpb=f8d5dd05dd28fe122832b229c5298d254eb4b581

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index fb85f6c..4291e09 100644
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -1,16 +1,17 @@
 #!/bin/sh
-#
-# nfs-kernel-server
-#		This shell script takes care of starting and stopping
-#               the kernel-mode NFS server.
-#
-# chkconfig: 345 60 20
-# description: NFS is a popular protocol for file sharing across TCP/IP \
-#              networks. This service provides NFS server functionality, \
-#              which is configured via the /etc/exports file.
-#
-
-set -e
+
+### BEGIN INIT INFO
+# Provides:          nfs-kernel-server
+# 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
+# Description:       NFS is a popular protocol for file sharing across
+#		     TCP/IP networks. This service provides NFS server
+#                    functionality, which is configured via the
+#                    /etc/exports file.
+### END INIT INFO
 
 # What is this?
 DESC="NFS kernel daemon"
@@ -26,16 +27,17 @@ DEFAULTFILE=/etc/default/nfs-kernel-server
 RPCNFSDCOUNT=8
 RPCNFSDPRIORITY=0
 RPCMOUNTDOPTS=
-NEED_SVCGSSD=yes
-RPCGSSDOPTS=
+NEED_SVCGSSD=no
 RPCSVCGSSDOPTS=
 PROCNFSD_MOUNTPOINT=/proc/fs/nfsd
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
 fi
 
+. /lib/lsb/init-functions
+
 do_modprobe() {
-    if [ -x /sbin/modprobe ]
+    if [ -x /sbin/modprobe -a -f /proc/modules ]
     then
         modprobe -q "$1" || true
     fi
@@ -57,29 +59,36 @@ do_mount() {
 # See how we were called.
 case "$1" in
   start)
-	cd /	# daemons should have root dir as cwd
 	if [ -f /etc/exports ]
 	then
 		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
-			echo "Not starting $DESC: no support in current kernel."
+		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
 		
 		do_mount nfsd $PROCNFSD_MOUNTPOINT || NEED_SVCGSSD=no
-		printf "Exporting directories for $DESC..."
+		log_begin_msg "Exporting directories for $DESC..."
 		$PREFIX/sbin/exportfs -r
-		echo "done."
+		RET=$?
+		if [ $RET != 0 ]; then
+			log_end_msg $RET
+			exit $RET
+		fi
+		log_end_msg 0
 
-		printf "Starting $DESC:"
-		printf " nfsd"
+		log_daemon_msg "Starting $DESC"
+		log_progress_msg "nfsd"
 		start-stop-daemon --start --oknodo --quiet \
 		    --nicelevel $RPCNFSDPRIORITY \
 		    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
-
-		printf " mountd"
+		RET=$?
+		if [ $RET != 0 ]; then
+			log_end_msg $RET
+			exit $RET
+		fi
 
 		# make sure 127.0.0.1 is a valid source for requests
 		ClearAddr=
@@ -95,31 +104,81 @@ case "$1" in
 		    RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
 
 		[ -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
+			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
-		echo "."
+		RET=$?
+		if [ $RET != 0 ]; then
+			log_end_msg $RET
+			exit $RET
+		fi
+
+		log_end_msg 0
 	else
-		echo "Not starting $DESC: No exports."
+		log_warning_msg "Not starting $DESC: no exports."
 	fi
 	;;
 
   stop)
-	printf "Stopping $DESC: mountd"
+	log_daemon_msg "Stopping $DESC"
+
+	log_progress_msg "mountd"
 	start-stop-daemon --stop --oknodo --quiet \
 	    --name rpc.mountd --user 0
-	printf " nfsd"
+	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
+		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
-	echo "."
+	RET=$?
+	if [ $RET != 0 ]; then
+		log_end_msg $RET
+		exit $RET
+	fi
+
+	log_end_msg 0
 
-	printf "Unexporting directories for $DESC..."
+	log_begin_msg "Unexporting directories for $DESC..."
 	$PREFIX/sbin/exportfs -au
-	if mountpoint -q /proc/nfs/nfsd
+	RET=$?
+	if [ $RET != 0 ]; then
+		log_end_msg $RET
+		exit $RET
+	fi
+	log_end_msg 0
+
+	if mountpoint -q $PROCNFSD_MOUNTPOINT
 	then
 	    $PREFIX/sbin/exportfs -f
 	fi
-	echo "done."
 	;;
 
   status)
@@ -134,9 +193,11 @@ case "$1" in
 	;;
 
   reload | force-reload)
-	printf "Re-exporting directories for $DESC..."
+	log_begin_msg "Re-exporting directories for $DESC..."
 	$PREFIX/sbin/exportfs -r
-	echo "done."
+	RET=$?
+	log_end_msg $RET
+	exit $RET
 	;;
 
   restart)
@@ -146,7 +207,7 @@ case "$1" in
 	;;
 
   *)
-	echo "Usage: nfs-kernel-server {start|stop|status|reload|force-reload|restart}"
+	log_success_msg "Usage: nfs-kernel-server {start|stop|status|reload|force-reload|restart}"
 	exit 1
 	;;
 esac