X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fnfs-kernel-server.init;h=23215ecf9f046c69aaee1575bf5693b7b470034b;hb=2f4ca78f367a20096073f99d4ad244ea6caed55a;hp=e80026777b279646d84654fd3bfa06f3bb3caf62;hpb=43a26e8e4675e32d38a652f6f13e96d6b897cfab;p=nfs-utils.git

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index e800267..23215ec 100755
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -20,31 +20,58 @@ 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
 RPCNFSDCOUNT=8
 RPCMOUNTDOPTS=
+NEED_SVCGSSD=yes
+RPCGSSDOPTS=
+RPCSVCGSSDOPTS=
+PROCNFSD_MOUNTPOINT=/proc/fs/nfsd
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
 fi
 
+do_modprobe() {
+	modprobe -q $1 || true
+}
+
+do_mount() {
+	if ! grep -E -qs "$1\$" /proc/filesystems
+	then
+		return 1
+	fi
+	if ! mountpoint -q $2
+	then
+		mount -t $1 $3 $1 $2
+		return
+	fi
+	return 0
+}
+
 # See how we were called.
 case "$1" in
   start)
 	cd /	# daemons should have root dir as cwd
 	if grep -q '^/' /etc/exports
 	then
-	        # Having the 'nfsd' filesystem mounted (if available)
-	        # make client authentication more reliable.
-	        if [ -d /proc/fs/nfsd -a ! -f /proc/fs/nfsd/exports ]
-		then mount -t nfsd nfsd /proc/fs/nfsd
-		fi
+		do_modprobe nfsd
+		do_mount nfsd $PROCNFSD_MOUNTPOINT || NEED_SVCGSSD=no
 		printf "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
+               fi
+
 		printf " nfsd"
 		start-stop-daemon --start --quiet \
 		    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
@@ -78,6 +105,13 @@ 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
@@ -85,7 +119,6 @@ case "$1" in
 
 	printf "Unexporting directories for $DESC..."
 	$PREFIX/sbin/exportfs -au
-	if [ -f /proc/fs/nfsd/exports ] ; then umount /proc/fs/nfsd; fi
 	echo "done."
 	;;