X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fnfs-kernel-server.init;h=e80026777b279646d84654fd3bfa06f3bb3caf62;hb=021751e2e70c0d629bf196065816949e38b158d9;hp=c2ee49bbee1f45b516efce39a6906405d88fa0cd;hpb=24725201e1abc88e5e8859f8ece4a1dce1432d06;p=nfs-utils.git

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index c2ee49b..e800267 100755
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -10,16 +10,24 @@
 #              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=
+if [ -f $DEFAULTFILE ]; then
+    . $DEFAULTFILE
+fi
 
 # See how we were called.
 case "$1" in
@@ -27,6 +35,11 @@ case "$1" in
 	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
 		printf "Exporting directories for $DESC..."
 		$PREFIX/sbin/exportfs -r
 		echo "done."
@@ -35,9 +48,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 ||
+
+		# 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 "."
@@ -49,14 +77,15 @@ 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 [ -f /proc/fs/nfsd/exports ] ; then umount /proc/fs/nfsd; fi
 	echo "done."
 	;;
 
@@ -79,4 +108,3 @@ case "$1" in
 esac
 
 exit 0
-