r141 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-08-22 20:20:52 +0000 (Tue, 22 Aug 2006)
New Revision: 141

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/mdadm.config
Log:
   * Allow ARRAY lines in configuration file to break across lines
     (closes: #384222).


Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-08-22 20:14:34 UTC (rev 140)
+++ mdadm/trunk/debian/changelog	2006-08-22 20:20:52 UTC (rev 141)
@@ -1,3 +1,10 @@
+mdadm (2.5.3.git200608202239-2) unstable; urgency=low
+
+  * Allow ARRAY lines in configuration file to break across lines
+    (closes: #384222).
+
+ -- martin f. krafft <madduck at debian.org>  Tue, 22 Aug 2006 21:14:55 +0100
+
 mdadm (2.5.3.git200608202239-1) unstable; urgency=low
 
   * Tracking upstream git releases.

Modified: mdadm/trunk/debian/mdadm.config
===================================================================
--- mdadm/trunk/debian/mdadm.config	2006-08-22 20:14:34 UTC (rev 140)
+++ mdadm/trunk/debian/mdadm.config	2006-08-22 20:20:52 UTC (rev 141)
@@ -111,10 +111,10 @@
         fi
         
         if [ -f $CONFIG ]; then
-          if ! egrep -q "^ARRAY[[:space:]]+$i([[:space:]]+|$)" $CONFIG; then
+          if ! egrep -q "^(ARRAY)?[[:space:]]+$i([[:space:]]+|$)" $CONFIG; then
             t="$(readlink -nf "$i")"
             if [ -L "$i" ] \
-                && egrep -q "^ARRAY[[:space:]]+$t([[:space:]]|$)+" $CONFIG; then
+                && egrep -q "^(ARRAY)?[[:space:]]+$t([[:space:]]|$)+" $CONFIG; then
               i="$t"
             else
               db_subst mdadm/initrdstart_notinconf array "$i"