X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fnfs-kernel-server.init;h=e80026777b279646d84654fd3bfa06f3bb3caf62;hb=189ccff8698f922ccefe52bc72f66da2c66fa087;hp=43fb381f1e8f5226c220acb2d3f965efd950b499;hpb=312181c3f67fdce2388f1f58cfc220c09b551c59;p=nfs-utils.git

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 43fb381..e800267 100755
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -35,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."
@@ -43,24 +48,23 @@ case "$1" in
 		printf " nfsd"
 		start-stop-daemon --start --quiet \
 		    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
+
 		printf " mountd"
+
 		# make sure 127.0.0.1 is a valid source for requests
 		ClearAddr=
-		if [ -f /proc/net/rpc/auth.unix.ip/channel ] ; then
-		  if   grep -s 127.0.0.1 /proc/net/rpc/auth.unix.ip/content > /dev/null ; then
-		      : address already known
-		  else
-                      echo nfsd 127.0.0.1 2147483647 localhost > /proc/net/rpc/auth.unix.ip/channel
-		      ClearAddr=yes
-		  fi
+		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"
 
-		if [ -n "$ClearAddr" ]; then
-                        echo nfsd 127.0.0.1 1  > /proc/net/rpc/auth.unix.ip/channel
-		fi
+		[ -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
@@ -81,6 +85,7 @@ case "$1" in
 
 	printf "Unexporting directories for $DESC..."
 	$PREFIX/sbin/exportfs -au
+	if [ -f /proc/fs/nfsd/exports ] ; then umount /proc/fs/nfsd; fi
 	echo "done."
 	;;