Imported Debian patch 1.1.1~git-20070709-5

diff --git a/debian/changelog b/debian/changelog
index 55c5c1eed9ba187faf5d479e8e0c5be516c74852..8fc8dcac399a0bd5be2b2284fcb06ad6876cec38 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.1.1~git-20070709-5) unstable; urgency=low
+
+  * Fix totally broken export-detecting regex in the init script; patch by
+    Quentin Godfroy. (Closes: #444155)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Wed, 26 Sep 2007 17:50:40 +0200
+
 nfs-utils (1:1.1.1~git-20070709-4) unstable; urgency=low
 
   * Replaced libgssapi-dev as build-dependency by libgssglue-dev.

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 80dce3ee70f5b81ec5026254a9b73eaa29e7519e..2bfa59d2339961fd67897ec8e598db4644b19c7d 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -63,7 +63,7 @@ fi
 # condition in nfs-kernel-server's init script does, which has a value in
 # itself.
 #
-if [ -f /etc/exports ] && grep -q '^ .*/' /etc/exports; then
+if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then
     AUTO_NEED_IDMAPD=yes
 fi