Install osd_login (part of the autologin feature). - Add open-iscsi and watchdog...

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

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index a67f0d26d082864925a5babb1d3c436d5bd64d07..a5b41370ae9f5b7e51af300798cf450add29b6b1 100644 (file)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -60,7 +60,7 @@ do_mount() {
 # See how we were called.
 case "$1" in
   start)
-       if [ -f /etc/exports ]
+       if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports
        then
                do_modprobe nfsd
 
@@ -83,12 +83,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
+               /usr/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