X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-kernel-server.init;h=0894f2038be86bcd0b17939b8f9503eb36621600;hp=23215ecf9f046c69aaee1575bf5693b7b470034b;hb=5bf7310498337de9c05f7b6780b29a3ef5cf6bac;hpb=e06694ca075bc26870d3504dddda814f56a61a81

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 23215ec..0894f20 100755
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -20,58 +20,26 @@ 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
-		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
@@ -105,13 +73,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