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 1818b9e..fb85f6c
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -20,7 +20,6 @@ PREFIX=/usr
 [ -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
@@ -62,22 +61,21 @@ case "$1" in
        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
 
@@ -98,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
@@ -110,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
@@ -131,6 +122,17 @@ case "$1" in
        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
@@ -144,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