X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-kernel-server.init;h=fb85f6c11772bb7f36eb57f3e904598c82615190;hp=0cd93a0279054ff4c5a8dd5ffa6629337baf7085;hb=ebf259dfcee762c98ac530d558ca9126c983b1a5;hpb=ceb3481d56857ecd5cb83cd34973fb89090ff691

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
old mode 100755
new mode 100644
index 0cd93a0..fb85f6c
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -20,7 +20,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
@@ -64,7 +63,7 @@ case "$1" in
 		do_modprobe nfsd
 
 		# See if our running kernel supports the NFS kernel server
-		if [ -f /proc/kallsyms ] && ! grep -q init_nfsd /proc/kallsyms; then
+		if [ -f /proc/kallsyms ] && ! grep -qE 'init_nf(sd|	)' /proc/kallsyms; then
 			echo "Not starting $DESC: no support in current kernel."
 			exit 0
 		fi
@@ -75,16 +74,8 @@ case "$1" in
 		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
-		fi
-
 		printf " nfsd"
-		start-stop-daemon --start --quiet \
+		start-stop-daemon --start --oknodo --quiet \
 		    --nicelevel $RPCNFSDPRIORITY \
 		    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
 
@@ -105,7 +96,7 @@ case "$1" in
 
 		[ -z "$ClearAddr" ] || echo "nfsd 127.0.0.1 1" >/proc/net/rpc/auth.unix.ip/channel
 
-		start-stop-daemon --start --quiet \
+		start-stop-daemon --start --oknodo --quiet \
 		    --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
 		echo "."
 	else
@@ -117,13 +108,6 @@ case "$1" in
 	printf "Stopping $DESC: 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
-	fi
 	printf " nfsd"
 	start-stop-daemon --stop --oknodo --quiet \
 	    --name nfsd --user 0 --signal 2
@@ -138,6 +122,17 @@ case "$1" in
 	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..."
 	$PREFIX/sbin/exportfs -r
@@ -151,7 +146,7 @@ case "$1" in
 	;;
 
   *)
-	echo "Usage: nfs-kernel-server {start|stop|reload|force-reload|restart}"
+	echo "Usage: nfs-kernel-server {start|stop|status|reload|force-reload|restart}"
 	exit 1
 	;;
 esac