Reformat temporary addition of 127.0.0.1 to auth channel.

[nfs-utils.git] / debian / nfs-kernel-server.init

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index c2ee49bbee1f45b516efce39a6906405d88fa0cd..0894f2038be86bcd0b17939b8f9503eb36621600 100755 (executable)
--- 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
@@ -35,9 +43,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,10 +72,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..."
@@ -79,4 +102,3 @@ case "$1" in
 esac
 
 exit 0
-