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

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index e800267..922b734 100755
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -17,36 +17,75 @@ DESC="NFS kernel daemon"
 PREFIX=/usr
 
 # Exit if required binaries are missing.
-[ -x $PREFIX/sbin/rpc.nfsd ] || exit 0
-[ -x $PREFIX/sbin/rpc.mountd ] || exit 0
-[ -x $PREFIX/sbin/exportfs ] || exit 0
+[ -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
+RPCNFSDPRIORITY=0
 RPCMOUNTDOPTS=
+NEED_SVCGSSD=yes
+RPCGSSDOPTS=
+RPCSVCGSSDOPTS=
+PROCNFSD_MOUNTPOINT=/proc/fs/nfsd
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
 fi
 
+do_modprobe() {
+    if [ -x /sbin/modprobe ]
+    then
+        modprobe -q "$1" || true
+    fi
+}
+
+do_mount() {
+    if ! grep -E -qs "$1\$" /proc/filesystems
+    then
+	return 1
+    fi
+    if ! mountpoint -q "$2"
+    then
+	mount -t "$1" "$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
+	if [ -f /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
+		do_modprobe nfsd
+
+		# See if our running kernel supports the NFS kernel server
+		if [ -f /proc/kallsyms ] && ! grep -q nfsd_version /proc/kallsyms; then
+			echo "Not starting $DESC: no support in current kernel."
+			exit 0
 		fi
+		
+		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 \
+		    --nicelevel $RPCNFSDPRIORITY \
 		    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
 
 		printf " mountd"
@@ -78,6 +117,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 +131,10 @@ case "$1" in
 
 	printf "Unexporting directories for $DESC..."
 	$PREFIX/sbin/exportfs -au
-	if [ -f /proc/fs/nfsd/exports ] ; then umount /proc/fs/nfsd; fi
+	if mountpoint -q /proc/nfs/nfsd
+	then
+	    $PREFIX/sbin/exportfs -f
+	fi
 	echo "done."
 	;;