X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-kernel-server.init;h=fb85f6c11772bb7f36eb57f3e904598c82615190;hp=1626213119b2c6af24c9922e97a93ec2d1c2feab;hb=ebf259dfcee762c98ac530d558ca9126c983b1a5;hpb=8c8a9fb90c606cd8fc852a60727291cf9dea051c

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
old mode 100755
new mode 100644
index 1626213..fb85f6c
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -10,36 +10,93 @@
 #              which is configured via the /etc/exports file.
 #
 
-PREFIX=/usr
-[ -x $PREFIX/sbin/rpc.nfsd ] || exit 0
-[ -x $PREFIX/sbin/rpc.mountd ] || exit 0
-[ -x $PREFIX/sbin/exportfs ] || exit 0
+set -e
 
 # What is this?
 DESC="NFS kernel daemon"
+PREFIX=/usr
 
-RPCNFSDCOUNT=8	# Number of servers to be started up by default
+# 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
+
+# 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
+}
 
-# Make sure that daemon cwds are in root fs.
-cd /
+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)
-	if grep -q '^/' /etc/exports; then
+	cd /	# daemons should have root dir as cwd
+	if [ -f /etc/exports ]
+	then
+		do_modprobe nfsd
+
+		# See if our running kernel supports the NFS kernel server
+		if [ -f /proc/kallsyms ] && ! grep -qE 'init_nf(sd|	)' /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:"
 		printf " nfsd"
-		start-stop-daemon --start --quiet \
+		start-stop-daemon --start --oknodo --quiet \
+		    --nicelevel $RPCNFSDPRIORITY \
 		    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
+
 		printf " mountd"
-		$PREFIX/bin/rpcinfo -u localhost nfs 3 > /dev/null 2>&1 ||
-		    RPCMOUNTDOPTS="$RPCMOUNDOPTS --no-nfs-version 3"
-		start-stop-daemon --start --quiet \
+
+		# make sure 127.0.0.1 is a valid source for requests
+		ClearAddr=
+		if [ -f /proc/net/rpc/auth.unix.ip/channel ]
+		then
+		    fgrep -qs 127.0.0.1 /proc/net/rpc/auth.unix.ip/content || {
+			echo "nfsd 127.0.0.1 2147483647 localhost" >/proc/net/rpc/auth.unix.ip/channel
+			ClearAddr=yes
+		    }
+		fi
+
+		$PREFIX/bin/rpcinfo -u localhost nfs 3 >/dev/null 2>&1 ||
+		    RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
+
+		[ -z "$ClearAddr" ] || echo "nfsd 127.0.0.1 1" >/proc/net/rpc/auth.unix.ip/channel
+
+		start-stop-daemon --start --oknodo --quiet \
 		    --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
 		echo "."
 	else
@@ -50,17 +107,32 @@ case "$1" in
   stop)
 	printf "Stopping $DESC: mountd"
 	start-stop-daemon --stop --oknodo --quiet \
-	    --exec $PREFIX/sbin/rpc.mountd
+	    --name rpc.mountd --user 0
 	printf " nfsd"
 	start-stop-daemon --stop --oknodo --quiet \
-	    --name nfsd --user root --signal 2
+	    --name nfsd --user 0 --signal 2
 	echo "."
 
 	printf "Unexporting directories for $DESC..."
 	$PREFIX/sbin/exportfs -au
+	if mountpoint -q /proc/nfs/nfsd
+	then
+	    $PREFIX/sbin/exportfs -f
+	fi
 	echo "done."
 	;;
 
+  status)
+	if pidof nfsd >/dev/null
+	then
+	    echo "nfsd running"
+	    exit 0
+	else
+	    echo "nfsd not running"
+	    exit 3
+	fi
+	;;
+
   reload | force-reload)
 	printf "Re-exporting directories for $DESC..."
 	$PREFIX/sbin/exportfs -r
@@ -74,10 +146,9 @@ case "$1" in
 	;;
 
   *)
-	echo "Usage: nfs-kernel-server {start|stop|reload|force-reload|restart}"
+	echo "Usage: nfs-kernel-server {start|stop|status|reload|force-reload|restart}"
 	exit 1
 	;;
 esac
 
 exit 0
-