[Fai-commit] r6485 - branches/stable/3.4/lib/setup-storage

[Michael Prokop]

Author: mika
Date: 2011-04-18 13:36:45 +0000 (Mon, 18 Apr 2011)
New Revision: 6485

Modified:
   branches/stable/3.4/lib/setup-storage/Parser.pm
Log:
Merge branch 'mika/devmeeting' into stable

From: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/lib/setup-storage/Parser.pm
===================================================================
--- branches/stable/3.4/lib/setup-storage/Parser.pm	2011-04-18 13:30:50 UTC (rev 6484)
+++ branches/stable/3.4/lib/setup-storage/Parser.pm	2011-04-18 13:36:45 UTC (rev 6485)
@@ -522,10 +522,6 @@
             $FAI::configs{"VG_$1"}{volumes}{$2}{size}{always_format} = 1;
           }
         }
-        | /^align-at:(\d+[kKMGTPiB]*)/
-        {
-          $FAI::configs{$FAI::device}{align_at} = &FAI::convert_unit($1) * 1024.0 * 1024.0;
-        }
 
 
     option: /^preserve_always:(\d+(,\d+)*)/
@@ -623,6 +619,11 @@
         {
           $FAI::configs{$FAI::device}{partitions}{$_}{size}{always_format} = 1 foreach (split(",", $1));
         }
+        | /^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;
+        }
 
     volume: /^vg\s+/ name devices vgcreateopt(s?)
         | /^raid([0156]|10)\s+/