[Fai-commit] r6487 - trunk/lib/setup-storage

[Michael Tautschnig]

Author: mt
Date: 2011-04-18 14:10:37 +0000 (Mon, 18 Apr 2011)
New Revision: 6487

Modified:
   trunk/lib/setup-storage/Parser.pm
Log:
setup-storage/Parser.pm: Finally fix align-at parser bug.


Modified: trunk/lib/setup-storage/Parser.pm
===================================================================
--- trunk/lib/setup-storage/Parser.pm	2011-04-18 14:08:24 UTC (rev 6486)
+++ trunk/lib/setup-storage/Parser.pm	2011-04-18 14:10:37 UTC (rev 6487)
@@ -690,7 +690,7 @@
             $FAI::configs{$FAI::device}{partitions}{$_}{size}{always_format} = 1 foreach (split(",", $1));
           }
         }
-        | /^align-at:(\d+[kKMGTPiB]*)/
+        | /^align-at:(\d+)([kKMGTPiB]+)?/
         {
           my $u = defined($2) ? $2 : "MiB";
           $FAI::configs{$FAI::device}{align_at} = &FAI::convert_unit("$1$u") * 1024.0 * 1024.0;