r281 - in mdadm/trunk/debian: . initramfs

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-12-08 09:14:44 +0100 (Fri, 08 Dec 2006)
New Revision: 281

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/initramfs/hook
Log:
* Only parse ARRAY lines from configuration file when collecting the array
  pairs. Thanks to Daniel Dehennin for the bug report and suggested fix
  (closes: #402106).
* Prevent modules from being loaded during initramfs time if no arrays are
  to be assembled at this stage.

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-11-20 07:05:39 UTC (rev 280)
+++ mdadm/trunk/debian/changelog	2006-12-08 08:14:44 UTC (rev 281)
@@ -1,3 +1,13 @@
+mdadm (2.5.6-7) unstable; urgency=low
+
+  * Only parse ARRAY lines from configuration file when collecting the array
+    pairs. Thanks to Daniel Dehennin for the bug report and suggested fix
+    (closes: #402106).
+  * Prevent modules from being loaded during initramfs time if no arrays are
+    to be assembled at this stage.
+
+ -- martin f. krafft <madduck at debian.org>  Fri,  8 Dec 2006 12:14:07 +0400
+
 mdadm (2.5.6-6) unstable; urgency=medium
 
   * Fixed a typo in the debconf control script which would cause failures with

Modified: mdadm/trunk/debian/initramfs/hook
===================================================================
--- mdadm/trunk/debian/initramfs/hook	2006-11-20 07:05:39 UTC (rev 280)
+++ mdadm/trunk/debian/initramfs/hook	2006-12-08 08:14:44 UTC (rev 281)
@@ -184,6 +184,10 @@
   # obtain dev:level pairs from config file, honouring multiline entries
   devpairs="$(
     while read line; do
+      case "$line" in
+        (ARRAY*) :;;
+        (*) continue;;
+      esac
       for atom in $line; do
         case "$atom" in
           (/dev*) dev=$atom;;
@@ -264,6 +268,7 @@
 
 else
   echo "MD_DEVS=none" >> $DESTCONFIG
+  echo "MD_MODULES=''" >> $DESTCONFIG
   info "no MD arrays will be started from the initial ramdisk." >&2
 fi