misc debian fixed from trond

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

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 43fb381f1e8f5226c220acb2d3f965efd950b499..d500ebcae56679cfd17f37159ddb66873d0c1e11 100755 (executable)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -25,16 +25,36 @@ PREFIX=/usr
 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
+}
+
+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)
        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."
@@ -43,24 +63,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