Imported Debian patch 1.0.8-6

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

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
old mode 100755 (executable)
new mode 100644 (file)
index 23215ec..fb85f6c
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -17,14 +17,14 @@ 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.svcgssd ] || exit 0
+[ -x $PREFIX/sbin/rpc.nfsd    ] || exit 0
+[ -x $PREFIX/sbin/rpc.mountd  ] || exit 0
+[ -x $PREFIX/sbin/exportfs    ] || exit 0
 
 # Read config
 DEFAULTFILE=/etc/default/nfs-kernel-server
 RPCNFSDCOUNT=8
+RPCNFSDPRIORITY=0
 RPCMOUNTDOPTS=
 NEED_SVCGSSD=yes
 RPCGSSDOPTS=
@@ -35,45 +35,48 @@ if [ -f $DEFAULTFILE ]; then
 fi
 
 do_modprobe() {
-       modprobe -q $1 || true
+    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 $3 $1 $2
-               return
-       fi
-       return 0
+    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 -qE 'init_nf(sd|     )' /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 \
+               start-stop-daemon --start --oknodo --quiet \
+                   --nicelevel $RPCNFSDPRIORITY \
                    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
 
                printf " mountd"
@@ -93,7 +96,7 @@ case "$1" in
 
                [ -z "$ClearAddr" ] || echo "nfsd 127.0.0.1 1" >/proc/net/rpc/auth.unix.ip/channel
 
-               start-stop-daemon --start --quiet \
+               start-stop-daemon --start --oknodo --quiet \
                    --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
                echo "."
        else
@@ -105,13 +108,6 @@ 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
@@ -119,9 +115,24 @@ 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."
        ;;
 
+  status)
+       if pidof nfsd >/dev/null
+       then
+           echo "nfsd running"
+           exit 0
+       else
+           echo "nfsd not running"
+           exit 3
+       fi
+       ;;
+
   reload | force-reload)
        printf "Re-exporting directories for $DESC..."
        $PREFIX/sbin/exportfs -r
@@ -135,7 +146,7 @@ case "$1" in
        ;;
 
   *)
-       echo "Usage: nfs-kernel-server {start|stop|reload|force-reload|restart}"
+       echo "Usage: nfs-kernel-server {start|stop|status|reload|force-reload|restart}"
        exit 1
        ;;
 esac