[Fai-commit] r5441 - in trunk: debian lib/setup-storage

[Michael Tautschnig]

Author: mt
Date: 2009-07-19 15:04:48 +0000 (Sun, 19 Jul 2009)
New Revision: 5441

Modified:
   trunk/debian/changelog
   trunk/lib/setup-storage/Volumes.pm
Log:
merged patch to support current mdadm versions


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-07-19 14:53:12 UTC (rev 5440)
+++ trunk/debian/changelog	2009-07-19 15:04:48 UTC (rev 5441)
@@ -26,6 +26,8 @@
   * setup-storage, setup-storage/Exec.pm: auto-detect a proper way to tell
     udev to settle (udevsettle is used in etch, udevadm settle for sid; thanks
     matrix.systems at matrix.msu.edu for a first patch). (closes: #530656)
+  * setup-storage/Volumes.pm: Updated mdadm --scan output parser to work with
+    current mdadm versions.
   
  -- Thomas Lange <lange at debian.org>  Sun, 19 Jul 2009 12:08:02 +0200
 

Modified: trunk/lib/setup-storage/Volumes.pm
===================================================================
--- trunk/lib/setup-storage/Volumes.pm	2009-07-19 14:53:12 UTC (rev 5440)
+++ trunk/lib/setup-storage/Volumes.pm	2009-07-19 15:04:48 UTC (rev 5441)
@@ -353,17 +353,27 @@
 #    devices=/dev/hda1,/dev/hda2
 # ARRAY /dev/md1 level=raid0 num-devices=2 UUID=50d7a6ec:4207f0db:b110d941:ce79a4f6
 #    devices=/dev/md0,/dev/hda3
+# or (newer version of mdadm?)
+# kueppers[~]# mdadm --detail --scan --verbose -c partitions
+# ARRAY /dev/md0 level=raid0 num-devices=3 metadata=00.90
+# UUID=a4553444:0baf31ae:135399f0:a895f15f
+#    devices=/dev/sdf2,/dev/sdd2,/dev/sde2
+# ARRAY /dev/md1 level=raid0 num-devices=3 metadata=00.90
+# UUID=77a22e9f:83fd1276:135399f0:a895f15f
+#    devices=/dev/sde3,/dev/sdf3,/dev/sdd3
 
+
   # the id of the RAID
   my $id;
 
   # parse the output line by line
   foreach my $line (@mdadm_print) {
-    if ($line =~ /^ARRAY \/dev\/md(\d+) level=(\S+) num-devices=\d+ UUID=/) {
+    if ($line =~ /^ARRAY \/dev\/md(\d+) level=(\S+) num-devices=\d+(\s+|$)/) {
       $id = $1;
       $FAI::current_raid_config{$id}{mode} = $2;
       &FAI::push_command( "true", "", "exist_/dev/md$id" );
     } elsif ($line =~ /^\s*devices=(\S+)$/) {
+      defined($id) or &FAI::internal_error("mdadm ARRAY line not yet seen");
       @{ $FAI::current_raid_config{$id}{devices} } = split (",", $1);
     }
   }