X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-kernel-server.init;h=7ce79f5a814a33d351b5abb9eeb8cf678a6eb234;hp=f9a385c666c6123f73a8c9cfb75fa2433c8cd205;hb=d3143a07f71a7177aca9391dcf50be46ef9d5eea;hpb=b28a50b0f9f5b32dfca23ff3bec6da0fe17d4219

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index f9a385c..7ce79f5 100644
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -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) 2>/dev/null
+		# 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,7 +117,7 @@ case "$1" in
 		    }
 		fi
 
-		$PREFIX/bin/rpcinfo -u localhost nfs 3 >/dev/null 2>&1 ||
+		$PREFIX/sbin/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