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

[Michael Tautschnig]

Author: mt
Date: 2011-06-29 21:38:27 +0000 (Wed, 29 Jun 2011)
New Revision: 6584

Added:
   branches/experimental/patches/setup-storage_gpt-100-bugfix
Modified:
   branches/experimental/patches/series
Log:
setup-storage: 100% and gpt bugfix (re-opened #619136)


Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2011-06-24 10:01:24 UTC (rev 6583)
+++ branches/experimental/patches/series	2011-06-29 21:38:27 UTC (rev 6584)
@@ -21,3 +21,4 @@
 setup-storage_softraid-assemble-error
 setup-storage_align-first-part-preserve
 setup-storage_udevsettle-before-vol-id
+setup-storage_gpt-100-bugfix

Added: branches/experimental/patches/setup-storage_gpt-100-bugfix
===================================================================
--- branches/experimental/patches/setup-storage_gpt-100-bugfix	                        (rev 0)
+++ branches/experimental/patches/setup-storage_gpt-100-bugfix	2011-06-29 21:38:27 UTC (rev 6584)
@@ -0,0 +1,27 @@
+2011-06-29  Michael Tautschnig  <mt at debian.org>
+
+	* setup-storage/Sizes.pm: Use (virtual) end of disk for 100% size computation
+		instead of disk size to fix 100% and gpt configuration issue
+		(closes: #619136).
+Index: trunk/lib/setup-storage/Sizes.pm
+===================================================================
+--- trunk.orig/lib/setup-storage/Sizes.pm
++++ trunk/lib/setup-storage/Sizes.pm
+@@ -460,7 +460,7 @@
+     $next_start;
+ 
+   if (1 == $part_id) {
+-    $max_avail = $current_disk->{size} - $next_start;
++    $max_avail = $current_disk->{end_byte} + 1 - $next_start;
+     $max_avail = "${max_avail}B";
+   }
+   my ($start, $end) = &FAI::make_range($part->{size}->{range}, $max_avail);
+@@ -671,7 +671,7 @@
+     }
+ 
+     # the size of a 100% partition (the 100% available to the user)
+-    my $max_avail = $current_disk->{size} - $next_start;
++    my $max_avail = $current_disk->{end_byte} + 1 - $next_start;
+     # expressed in bytes
+     $max_avail = "${max_avail}B";
+