Iterate through exports.d to look for expors (Closes: #676604).

diff --git a/debian/changelog b/debian/changelog
index 9657c9b0e0d100c0da31f580bb78ce198c0a75e9..93915308f09410b4ed82b6e9fd9a24b291eb9ded 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nfs-utils (1:1.2.6-3) UNRELEASED; urgency=low
+
+  * Iterate through exports.d to look for expors (Closes: #676604).
+
+ -- Luk Claes <luk@zomers.be>  Tue, 10 Jul 2012 19:35:56 +0200
+
 nfs-utils (1:1.2.6-2) unstable; urgency=low
 
   * Move open-iscsi and watchdog to Suggests.

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index a5b41370ae9f5b7e51af300798cf450add29b6b1..d00b2ec4fbe238a4a1e68867b068d97fde3f321b 100644 (file)
--- 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 ] && grep -q '^[[:space:]]*[^#]*/' /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