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

[Michael Prokop]

Author: mika
Date: 2011-04-19 16:35:47 +0000 (Tue, 19 Apr 2011)
New Revision: 6497

Modified:
   branches/stable/3.4/lib/setup-storage/Parser.pm
   branches/stable/3.4/lib/setup-storage/Sizes.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-19 12:02:54 UTC (rev 6496)
+++ branches/stable/3.4/lib/setup-storage/Parser.pm	2011-04-19 16:35:47 UTC (rev 6497)
@@ -619,7 +619,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;

Modified: branches/stable/3.4/lib/setup-storage/Sizes.pm
===================================================================
--- branches/stable/3.4/lib/setup-storage/Sizes.pm	2011-04-19 12:02:54 UTC (rev 6496)
+++ branches/stable/3.4/lib/setup-storage/Sizes.pm	2011-04-19 16:35:47 UTC (rev 6497)
@@ -449,6 +449,9 @@
     ($next_start <= $current_disk->{partitions}->{$part_id}->{begin_byte})
       or die "Cannot preserve start byte of ntfs volume on partition $part_id, space before it is too small\n";
     $next_start = $current_disk->{partitions}->{$part_id}->{begin_byte};
+  } else {
+    $next_start += $block_size - ($next_start % $block_size)
+      unless (0 == ($next_start % $block_size));
   }
 
   $FAI::configs{$config}{partitions}{$part_id}{start_byte} =