martin f. krafft: Do not include DEVICE line in generated configs but use the built-in value by default

[Martin F. Krafft]

Module: mdadm
Branch: master
Commit: 67b3acda76197d8730127fabd9fbdf211ee68121
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=67b3acda76197d8730127fabd9fbdf211ee68121

Author: martin f. krafft <madduck at debian.org>
Date:   Mon Jan 31 14:58:52 2011 +0100

Do not include DEVICE line in generated configs but use the built-in value by default

Debian-Bug: 604702
Signed-off-by: martin f. krafft <madduck at debian.org>

---

 debian/changelog |    4 +++-
 debian/mkconf.in |    7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe5204b..75f5527 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ mdadm (3.1.5-1~unreleased.0) UNRELEASED; urgency=low
   * Fix checkarray script so that it does not die after scheduling the first
     device when there is no scheduling class specified; thanks to Mario
     'BitKoenig' Holbe (closes: #611627).
+  * Do not include DEVICE line in generated configs but use the built-in value
+    by default (closes: #604702).
 
- -- martin f. krafft <madduck at debian.org>  Mon, 31 Jan 2011 14:48:56 +0100
+ -- martin f. krafft <madduck at debian.org>  Mon, 31 Jan 2011 14:58:22 +0100
 
 mdadm (3.1.4-1+8efb9d1) unstable; urgency=low
 
diff --git a/debian/mkconf.in b/debian/mkconf.in
index 9d75712..129d497 100644
--- a/debian/mkconf.in
+++ b/debian/mkconf.in
@@ -57,9 +57,10 @@ cat <<_eof
 # Please refer to mdadm.conf(5) for information about this file.
 #
 
-# by default, scan all partitions (/proc/partitions) for MD superblocks.
-# alternatively, specify devices to scan, using wildcards if desired.
-DEVICE ${DEVICE:-partitions}
+# by default (built-in), scan all partitions (/proc/partitions) and all
+# containers for MD superblocks. alternatively, specify devices to scan, using
+# wildcards if desired.
+#DEVICE ${DEVICE:-partitions containers}
 
 # auto-create devices with Debian standard permissions
 CREATE ${CREATE:-owner=root group=disk mode=0660 auto=yes}