X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-kernel-server.init;h=15b3254933635dcea10582b9780ea970871453bb;hp=922b7349f49481b0c36f34ef2569b726d7574d7f;hb=refs%2Ftags%2Fdebian%2F1%251.0.8%2B1.0.9pre1-1;hpb=ab1d7b6062aba3bb5cf62325b37ee1e34b864c3f

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
old mode 100755
new mode 100644
index 922b734..15b3254
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -10,8 +10,6 @@
 #              which is configured via the /etc/exports file.
 #
 
-set -e
-
 # What is this?
 DESC="NFS kernel daemon"
 PREFIX=/usr
@@ -20,7 +18,6 @@ PREFIX=/usr
 [ -x $PREFIX/sbin/rpc.nfsd    ] || exit 0
 [ -x $PREFIX/sbin/rpc.mountd  ] || exit 0
 [ -x $PREFIX/sbin/exportfs    ] || exit 0
-[ -x $PREFIX/sbin/rpc.svcgssd ] || exit 0
 
 # Read config
 DEFAULTFILE=/etc/default/nfs-kernel-server
@@ -35,6 +32,8 @@ if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
 fi
 
+. /lib/lsb/init-functions
+
 do_modprobe() {
     if [ -x /sbin/modprobe ]
     then
@@ -58,37 +57,34 @@ 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 -q nfsd_version /proc/kallsyms; then
-			echo "Not starting $DESC: no support in current kernel."
+		if [ -f /proc/kallsyms ] && ! grep -qE 'init_nf(sd|	)' /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."
-
-		printf "Starting $DESC:"
-		if [ "$NEED_SVCGSSD" = yes ]
-		then
-		    printf " svcgssd"
-		    start-stop-daemon --start --quiet \
-			    --make-pidfile --pidfile /var/run/rpc.svcgssd.pid \
-			    --exec $PREFIX/sbin/rpc.svcgssd -- $RPCSVCGSSDOPTS
+		if [ $? != 0 ]; then
+			log_end_msg $?
+			exit $?
 		fi
+		log_end_msg 0
 
-		printf " nfsd"
-		start-stop-daemon --start --quiet \
+		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"
+		if [ $? != 0 ]; then
+			log_end_msg $?
+			exit $?
+		fi
 
 		# make sure 127.0.0.1 is a valid source for requests
 		ClearAddr=
@@ -105,43 +101,71 @@ case "$1" in
 
 		[ -z "$ClearAddr" ] || echo "nfsd 127.0.0.1 1" >/proc/net/rpc/auth.unix.ip/channel
 
-		start-stop-daemon --start --quiet \
+		log_progress_msg "mountd"
+		start-stop-daemon --start --oknodo --quiet \
 		    --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
-		echo "."
+		if [ $? != 0 ]; then
+			log_end_msg $?
+			exit $?
+		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
-	if [ "$NEED_SVCGSSD" = yes ]
-	then
-	    printf " svcgssd"
-	    start-stop-daemon --stop --oknodo --quiet \
-		    --name rpc.svcgssd --user 0
-	    rm -f /var/run/rpc.svcgssd.pid
+	if [ $? != 0 ]; then
+		log_end_msg $?
+		exit $?
 	fi
-	printf " nfsd"
+
+	log_progress_msg "nfsd"
 	start-stop-daemon --stop --oknodo --quiet \
 	    --name nfsd --user 0 --signal 2
-	echo "."
+	if [ $? != 0 ]; then
+		log_end_msg $?
+		exit $?
+	fi
+
+	log_end_msg 0
 
-	printf "Unexporting directories for $DESC..."
+	log_begin_msg "Unexporting directories for $DESC..."
 	$PREFIX/sbin/exportfs -au
+	if [ $? != 0 ]; then
+		log_end_msg $?
+		exit $?
+	fi
+	log_end_msg 0
+
 	if mountpoint -q /proc/nfs/nfsd
 	then
 	    $PREFIX/sbin/exportfs -f
 	fi
-	echo "done."
+	;;
+
+  status)
+	if pidof nfsd >/dev/null
+	then
+	    echo "nfsd running"
+	    exit 0
+	else
+	    echo "nfsd not running"
+	    exit 3
+	fi
 	;;
 
   reload | force-reload)
-	printf "Re-exporting directories for $DESC..."
+	log_begin_msg "Re-exporting directories for $DESC..."
 	$PREFIX/sbin/exportfs -r
-	echo "done."
+	log_end_msg $?
+	exit $?
 	;;
 
   restart)
@@ -151,7 +175,7 @@ case "$1" in
 	;;
 
   *)
-	echo "Usage: nfs-kernel-server {start|stop|reload|force-reload|restart}"
+	log_success_msg "Usage: nfs-kernel-server {start|stop|status|reload|force-reload|restart}"
 	exit 1
 	;;
 esac