debian/nfs-kernel-server.init: don't try to check for nfsv3 configuration in nfsd...

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

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 298e3b45ef4184bbe557a93c83a72773d75e5d03..e0c51d6b778cbc53599f177f01b2ca8a0ba5b819 100644 (file)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 ### BEGIN INIT INFO
 # Provides:          nfs-kernel-server
@@ -60,7 +60,13 @@ do_mount() {
 # See how we were called.
 case "$1" in
   start)
-       if [ -f /etc/exports ]
+       export_files="/etc/exports"
+       for file in /etc/exports.d/*.exports ; do
+               if [ -f "$file" ]; then
+                       export_files="$export_files $file"
+               fi
+       done
+       if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' $export_files
        then
                do_modprobe nfsd
 
@@ -83,12 +89,12 @@ case "$1" in
                log_daemon_msg "Starting $DESC"
                log_progress_msg "nfsd"
                
-               # See if portmap or rpcbind are running
-               cat </dev/null >/dev/tcp/localhost/111
+               # See if rpcbind is running
+               $PREFIX/sbin/rpcinfo -p >/dev/null 2>&1
                RET=$?
                if [ $RET != 0 ]; then
                    echo
-                   log_warning_msg "Not starting: portmap daemon is not running"
+                   log_warning_msg "Not starting: portmapper is not running"
                    exit 0
                fi
 
@@ -111,9 +117,6 @@ case "$1" in
                    }
                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
        
                if [ "$NEED_SVCGSSD" = "yes" ]; then