[Fai-commit] r6279 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2011-02-08 00:04:12 +0000 (Tue, 08 Feb 2011)
New Revision: 6279

Modified:
   branches/experimental/patches/grub-pc
   branches/experimental/patches/setup-storage_better-error-msg
Log:
Updated experimental to match current trunk, improved mdadm error message to fix
recent bug report


Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2011-02-07 14:57:17 UTC (rev 6278)
+++ branches/experimental/patches/grub-pc	2011-02-08 00:04:12 UTC (rev 6279)
@@ -10,15 +10,15 @@
  dhcp3-client
  
  PACKAGES aptitude GRUB
--grub lilo-
-+grub lilo- grub-pc-
+-grub-legacy lilo-
++grub-legacy grub-pc- lilo-
  
  PACKAGES aptitude GRUB_PC
- grub-pc grub- lilo-
+ grub-pc grub-legacy- lilo-
  
  PACKAGES aptitude LILO
 -lilo grub-
-+lilo grub- grub-pc-
++lilo grub-legacy- grub-pc-
 Index: trunk/examples/simple/class/50-host-classes
 ===================================================================
 --- trunk.orig/examples/simple/class/50-host-classes

Modified: branches/experimental/patches/setup-storage_better-error-msg
===================================================================
--- branches/experimental/patches/setup-storage_better-error-msg	2011-02-07 14:57:17 UTC (rev 6278)
+++ branches/experimental/patches/setup-storage_better-error-msg	2011-02-08 00:04:12 UTC (rev 6279)
@@ -2,9 +2,10 @@
 
 	* setup-storage/Parser.pm: Fix error message in case of duplicate definitions
 		of a single disk. Sensible diagnostics instead of just printing "Syntax
-    error" for several syntax errors. Thanks Toomas Tamm for reporting this.
+		error" for several syntax errors. Thanks Toomas Tamm for reporting this.
 	* setup-storage/Volumes.pm: Proper error reporting for wrong disk names (one
-		die was overridden by yet another die).
+		die was overridden by yet another die); more verbose output in case of
+		unexpected mdadm output (closes: #611728).
 Index: trunk/lib/setup-storage/Parser.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
@@ -30,7 +31,18 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
 +++ trunk/lib/setup-storage/Volumes.pm	
-@@ -534,6 +534,8 @@
+@@ -456,7 +456,9 @@
+ 	  }
+       }
+     } elsif ($line =~ /^\s*devices=(\S+)$/) {
+-      defined($id) or &FAI::internal_error("mdadm ARRAY line not yet seen");
++      defined($id) or
++        &FAI::internal_error("mdadm ARRAY line not yet seen -- unexpected mdadm output:\n"
++          . join("", @mdadm_print));
+       push @{ $FAI::current_raid_config{$id}{devices} }, abs_path($_)
+         foreach (split (",", $1));
+  
+@@ -534,6 +536,8 @@
            defined ($FAI::current_config{$1}) or die
              "Can't preserve $1 because it does not exist\n";
          } else {