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

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 1626213..d500ebc 100755
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -10,24 +10,51 @@
 #              which is configured via the /etc/exports file.
 #
 
+set -e
+
+# What is this?
+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
 
-# What is this?
-DESC="NFS kernel daemon"
-
-RPCNFSDCOUNT=8	# Number of servers to be started up by default
+# Read config
+DEFAULTFILE=/etc/default/nfs-kernel-server
+RPCNFSDCOUNT=8
 RPCMOUNTDOPTS=
+PROCNFSD_MOUNTPOINT=/proc/fs/nfsd
+if [ -f $DEFAULTFILE ]; then
+    . $DEFAULTFILE
+fi
+
+do_modprobe() {
+	modprobe -q $1 || true
+}
 
-# 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 $3 $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 grep -q '^/' /etc/exports
+	then
+		do_modprobe nfsd
+		do_mount nfsd $PROCNFSD_MOUNTPOINT || true
 		printf "Exporting directories for $DESC..."
 		$PREFIX/sbin/exportfs -r
 		echo "done."
@@ -36,9 +63,24 @@ case "$1" in
 		printf " nfsd"
 		start-stop-daemon --start --quiet \
 		    --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"
+
+		# 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 --quiet \
 		    --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
 		echo "."
@@ -50,10 +92,10 @@ 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..."
@@ -80,4 +122,3 @@ case "$1" in
 esac
 
 exit 0
-