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

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 52913ae..06c40e6 100644
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -2,7 +2,8 @@
 
 ### BEGIN INIT INFO
 # Provides:          nfs-kernel-server
-# Required-Start:    $portmap $time
+# Required-Start:    nfs-common $portmap $time
+# Required-Stop:     $portmap $time
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Kernel NFS server support
@@ -26,8 +27,8 @@ DEFAULTFILE=/etc/default/nfs-kernel-server
 RPCNFSDCOUNT=8
 RPCNFSDPRIORITY=0
 RPCMOUNTDOPTS=
-NEED_SVCGSSD=yes
-RPCGSSDOPTS=
+NEED_MOUNTD=yes
+NEED_SVCGSSD=no
 RPCSVCGSSDOPTS=
 PROCNFSD_MOUNTPOINT=/proc/fs/nfsd
 if [ -f $DEFAULTFILE ]; then
@@ -102,13 +103,26 @@ 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
+			if [ $? != 0 ]; then
+				log_end_msg $?
+				exit $?
+			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 $?
+		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
 		fi
 
 		log_end_msg 0
@@ -119,13 +133,25 @@ case "$1" in
 
   stop)
 	log_daemon_msg "Stopping $DESC"
-	
-	log_progress_msg "mountd"
-	start-stop-daemon --stop --oknodo --quiet \
-	    --name rpc.mountd --user 0
-	if [ $? != 0 ]; then
-		log_end_msg $?
-		exit $?
+
+	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
+	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 $?
+		fi
 	fi
 
 	log_progress_msg "nfsd"
@@ -146,7 +172,7 @@ case "$1" in
 	fi
 	log_end_msg 0
 
-	if mountpoint -q /proc/nfs/nfsd
+	if mountpoint -q $PROCNFSD_MOUNTPOINT
 	then
 	    $PREFIX/sbin/exportfs -f
 	fi