From 110d06392a4419b31865612bf4facf48cb468a41 Mon Sep 17 00:00:00 2001 From: Luk Claes Date: Tue, 10 Jul 2012 19:37:24 +0200 Subject: [PATCH] Iterate through exports.d to look for expors (Closes: #676604). --- debian/changelog | 6 ++++++ debian/nfs-kernel-server.init | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9657c9b..9391530 100644 --- 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 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 a5b4137..d00b2ec 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 ] && 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 -- 2.39.5