X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fnfs-kernel-server.init;h=d00b2ec4fbe238a4a1e68867b068d97fde3f321b;hb=77ea014f9e1efc70a2cfbce3888b6905f4927b90;hp=bec2d0292294c60978d0da086f112e17625c9249;hpb=eba2a465f352aedaf400127c7bc3f6852666a6d9;p=nfs-utils.git

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index bec2d02..d00b2ec 100644
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 ### BEGIN INIT INFO
 # Provides:          nfs-kernel-server
 # Required-Start:    $remote_fs nfs-common $portmap $time
 # Required-Stop:     $remote_fs nfs-common $portmap $time
+# Should-Start:      $named
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Kernel NFS server support
@@ -59,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
 
@@ -81,6 +88,16 @@ case "$1" in
 
 		log_daemon_msg "Starting $DESC"
 		log_progress_msg "nfsd"
+		
+		# See if rpcbind is running
+		/usr/sbin/rpcinfo -p >/dev/null 2>&1
+		RET=$?
+		if [ $RET != 0 ]; then
+		    echo
+		    log_warning_msg "Not starting: portmapper is not running"
+		    exit 0
+		fi
+
 		start-stop-daemon --start --oknodo --quiet \
 		    --nicelevel $RPCNFSDPRIORITY \
 		    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT