X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-kernel-server.init;h=84f9c4dcb1d0fec982f3d001bd70cf0be714ce5f;hp=15b3254933635dcea10582b9780ea970871453bb;hb=3a11169202f9db0eb8b07612396e78ddbc5600f1;hpb=6b6945c52f6dbcdb2768e0b43ef3a865fe89b6ba

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 15b3254..84f9c4d 100644
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -1,14 +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.
-#
+
+### BEGIN INIT INFO
+# Provides:          nfs-kernel-server
+# 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
+# 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"
@@ -24,8 +27,7 @@ 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
@@ -35,7 +37,7 @@ 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
@@ -100,6 +102,17 @@ 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 \
@@ -125,6 +138,16 @@ case "$1" in
 		log_end_msg $?
 		exit $?
 	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"
 	start-stop-daemon --stop --oknodo --quiet \
@@ -144,7 +167,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