From: Luk Claes <luk@debian.org>
Date: Fri, 25 May 2012 17:31:04 +0000 (+0200)
Subject: Check for blank exports file (Closes: #673798).
X-Git-Tag: debian/1%1.2.6-1~7
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=422a50998d184c56158fdbda40b798da91523288;p=nfs-utils.git

Check for blank exports file (Closes: #673798).
---

diff --git a/debian/changelog b/debian/changelog
index 8c674bf..54eef7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nfs-utils (1:1.2.6-1) UNRELEASED; urgency=low
 
   * New upstream version
     - Remove 18-dont-use-PAGE_SIZE.patch: merged upstream.
+  * Check for blank exports file (Closes: #673798).
 
  -- Luk Claes <luk@debian.org>  Fri, 25 May 2012 19:16:54 +0200
 
diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 007b0df..a5b4137 100644
--- 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