Imported Debian patch 1.0.7-7

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

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 43fb381f1e8f5226c220acb2d3f965efd950b499..922b7349f49481b0c36f34ef2569b726d7574d7f 100755 (executable)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -17,50 +17,93 @@ 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
+[ -x $PREFIX/sbin/rpc.nfsd    ] || exit 0
+[ -x $PREFIX/sbin/rpc.mountd  ] || exit 0
+[ -x $PREFIX/sbin/exportfs    ] || exit 0
+[ -x $PREFIX/sbin/rpc.svcgssd ] || exit 0
 
 # Read config
 DEFAULTFILE=/etc/default/nfs-kernel-server
 RPCNFSDCOUNT=8
+RPCNFSDPRIORITY=0
 RPCMOUNTDOPTS=
+NEED_SVCGSSD=yes
+RPCGSSDOPTS=
+RPCSVCGSSDOPTS=
+PROCNFSD_MOUNTPOINT=/proc/fs/nfsd
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
 fi
 
+do_modprobe() {
+    if [ -x /sbin/modprobe ]
+    then
+        modprobe -q "$1" || true
+    fi
+}
+
+do_mount() {
+    if ! grep -E -qs "$1\$" /proc/filesystems
+    then
+       return 1
+    fi
+    if ! mountpoint -q "$2"
+    then
+       mount -t "$1" "$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
+       if [ -f /etc/exports ]
        then
+               do_modprobe nfsd
+
+               # See if our running kernel supports the NFS kernel server
+               if [ -f /proc/kallsyms ] && ! grep -q nfsd_version /proc/kallsyms; then
+                       echo "Not starting $DESC: no support in current kernel."
+                       exit 0
+               fi
+               
+               do_mount nfsd $PROCNFSD_MOUNTPOINT || NEED_SVCGSSD=no
                printf "Exporting directories for $DESC..."
                $PREFIX/sbin/exportfs -r
                echo "done."
 
                printf "Starting $DESC:"
+               if [ "$NEED_SVCGSSD" = yes ]
+               then
+                   printf " svcgssd"
+                   start-stop-daemon --start --quiet \
+                           --make-pidfile --pidfile /var/run/rpc.svcgssd.pid \
+                           --exec $PREFIX/sbin/rpc.svcgssd -- $RPCSVCGSSDOPTS
+               fi
+
                printf " nfsd"
                start-stop-daemon --start --quiet \
+                   --nicelevel $RPCNFSDPRIORITY \
                    --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
@@ -74,6 +117,13 @@ case "$1" in
        printf "Stopping $DESC: mountd"
        start-stop-daemon --stop --oknodo --quiet \
            --name rpc.mountd --user 0
+       if [ "$NEED_SVCGSSD" = yes ]
+       then
+           printf " svcgssd"
+           start-stop-daemon --stop --oknodo --quiet \
+                   --name rpc.svcgssd --user 0
+           rm -f /var/run/rpc.svcgssd.pid
+       fi
        printf " nfsd"
        start-stop-daemon --stop --oknodo --quiet \
            --name nfsd --user 0 --signal 2
@@ -81,6 +131,10 @@ case "$1" in
 
        printf "Unexporting directories for $DESC..."
        $PREFIX/sbin/exportfs -au
+       if mountpoint -q /proc/nfs/nfsd
+       then
+           $PREFIX/sbin/exportfs -f
+       fi
        echo "done."
        ;;