[Fai-commit] r6286 - branches/experimental/patches
Julien Blache
jblache at alioth.debian.org
Fri Feb 11 10:29:17 UTC 2011
Author: jblache
Date: 2011-02-11 10:29:15 +0000 (Fri, 11 Feb 2011)
New Revision: 6286
Modified:
branches/experimental/patches/setup-storage_extended-is-not-last
branches/experimental/patches/setup-storage_gpt-bios-fix
branches/experimental/patches/setup-storage_hardcode-63-sectors
branches/experimental/patches/setup-storage_no-cylinder-boundaries
branches/experimental/patches/setup-storage_user-100-percent
Log:
Not too sure why the MBR space reservation got removed, looks
like it better stay in; feel free to revert if I'm wrong.
Modified: branches/experimental/patches/setup-storage_extended-is-not-last
===================================================================
--- branches/experimental/patches/setup-storage_extended-is-not-last 2011-02-11 10:23:03 UTC (rev 6285)
+++ branches/experimental/patches/setup-storage_extended-is-not-last 2011-02-11 10:29:15 UTC (rev 6286)
@@ -4,8 +4,8 @@
last primary partition.
Index: trunk/lib/setup-storage/Sizes.pm
===================================================================
---- trunk.orig/lib/setup-storage/Sizes.pm 2011-02-11 11:15:09.488499572 +0100
-+++ trunk/lib/setup-storage/Sizes.pm 2011-02-11 11:15:28.428842194 +0100
+--- trunk.orig/lib/setup-storage/Sizes.pm 2011-02-11 11:27:02.684342413 +0100
++++ trunk/lib/setup-storage/Sizes.pm 2011-02-11 11:27:11.688342830 +0100
@@ -362,15 +362,9 @@
($part->{size}->{extended} == $curr_part->{is_extended})
or die "Preserved partition $part_dev_name can't change extended/normal setting\n";
@@ -25,7 +25,7 @@
}
# on gpt, ensure that the partition ends at a sector boundary
-@@ -710,37 +704,45 @@
+@@ -714,37 +708,45 @@
# reference to the current partition
my $part = (\%FAI::configs)->{$config}->{partitions}->{$part_id};
Modified: branches/experimental/patches/setup-storage_gpt-bios-fix
===================================================================
--- branches/experimental/patches/setup-storage_gpt-bios-fix 2011-02-11 10:23:03 UTC (rev 6285)
+++ branches/experimental/patches/setup-storage_gpt-bios-fix 2011-02-11 10:29:15 UTC (rev 6286)
@@ -4,8 +4,8 @@
first one.
Index: trunk/lib/setup-storage/Parser.pm
===================================================================
---- trunk.orig/lib/setup-storage/Parser.pm 2011-02-11 11:15:40.132344607 +0100
-+++ trunk/lib/setup-storage/Parser.pm 2011-02-11 11:15:42.788846341 +0100
+--- trunk.orig/lib/setup-storage/Parser.pm 2011-02-11 11:27:19.048345780 +0100
++++ trunk/lib/setup-storage/Parser.pm 2011-02-11 11:27:21.832346051 +0100
@@ -615,6 +615,20 @@
# supported by parted could be allowed, but others are not implemented
# yet
@@ -29,9 +29,9 @@
{
Index: trunk/lib/setup-storage/Sizes.pm
===================================================================
---- trunk.orig/lib/setup-storage/Sizes.pm 2011-02-11 11:15:28.428842194 +0100
-+++ trunk/lib/setup-storage/Sizes.pm 2011-02-11 11:15:42.788846341 +0100
-@@ -678,19 +678,6 @@
+--- trunk.orig/lib/setup-storage/Sizes.pm 2011-02-11 11:27:11.688342830 +0100
++++ trunk/lib/setup-storage/Sizes.pm 2011-02-11 11:27:21.832346051 +0100
+@@ -682,19 +682,6 @@
# the space required by the GPTs
$min_req_total_space += 33 * $current_disk->{sector_size};
Modified: branches/experimental/patches/setup-storage_hardcode-63-sectors
===================================================================
--- branches/experimental/patches/setup-storage_hardcode-63-sectors 2011-02-11 10:23:03 UTC (rev 6285)
+++ branches/experimental/patches/setup-storage_hardcode-63-sectors 2011-02-11 10:29:15 UTC (rev 6286)
@@ -5,8 +5,8 @@
gap. Thanks Mathieu Alorent for extensive testing.
Index: trunk/lib/setup-storage/Sizes.pm
===================================================================
---- trunk.orig/lib/setup-storage/Sizes.pm 2011-02-11 11:15:50.992348115 +0100
-+++ trunk/lib/setup-storage/Sizes.pm 2011-02-11 11:16:04.636843853 +0100
+--- trunk.orig/lib/setup-storage/Sizes.pm 2011-02-11 11:27:26.008342021 +0100
++++ trunk/lib/setup-storage/Sizes.pm 2011-02-11 11:27:36.676344640 +0100
@@ -650,9 +650,9 @@
my $next_start = 0;
@@ -19,4 +19,4 @@
+ $next_start = 63 * $current_disk->{sector_size};
$min_req_total_space += $next_start;
- } elsif ($FAI::configs{$config}{disklabel} eq "gpt") {
+ # the MBR requires space, too
Modified: branches/experimental/patches/setup-storage_no-cylinder-boundaries
===================================================================
--- branches/experimental/patches/setup-storage_no-cylinder-boundaries 2011-02-11 10:23:03 UTC (rev 6285)
+++ branches/experimental/patches/setup-storage_no-cylinder-boundaries 2011-02-11 10:29:15 UTC (rev 6286)
@@ -14,8 +14,8 @@
* setup-storage.8: Document new align-at option.
Index: trunk/lib/setup-storage/Sizes.pm
===================================================================
---- trunk.orig/lib/setup-storage/Sizes.pm 2011-02-11 11:04:45.276344608 +0100
-+++ trunk/lib/setup-storage/Sizes.pm 2011-02-11 11:15:09.488499572 +0100
+--- trunk.orig/lib/setup-storage/Sizes.pm 2011-02-11 11:25:13.936859044 +0100
++++ trunk/lib/setup-storage/Sizes.pm 2011-02-11 11:25:53.624346579 +0100
@@ -436,8 +436,9 @@
#
# @param $part_id Partition id within $config
@@ -102,18 +102,7 @@
# at various points the following code highly depends on the desired disk label!
# initialise variables
# the id of the extended partition to be created, if required
-@@ -653,10 +660,6 @@
- $next_start = $current_disk->{bios_sectors_per_track} *
- $current_disk->{sector_size};
-
-- # the MBR requires space, too
-- $min_req_total_space += $current_disk->{bios_sectors_per_track} *
-- $current_disk->{sector_size};
--
- } elsif ($FAI::configs{$config}{disklabel} eq "gpt") {
- # on GPT-EFI disk labels the first 34 and last 33 sectors must be left alone
- $next_start = 34 * $current_disk->{sector_size};
-@@ -668,13 +671,12 @@
+@@ -668,13 +674,12 @@
$min_req_total_space += (34 + 33) * $current_disk->{sector_size};
} elsif ($FAI::configs{$config}{disklabel} eq "gpt-bios") {
@@ -132,7 +121,7 @@
# apparently parted insists in having some space left at the end too
# modify the disk to claim the space for the second partition table
-@@ -741,7 +743,7 @@
+@@ -741,7 +746,7 @@
shift @worklist;
} else {
($next_start, $min_req_total_space) = &FAI::do_partition_real($part_id,
@@ -143,8 +132,8 @@
($part->{size}->{eff_size} > (&FAI::convert_unit("2TiB") * 1024.0 *
Index: trunk/lib/setup-storage/Parser.pm
===================================================================
---- trunk.orig/lib/setup-storage/Parser.pm 2011-02-11 11:04:45.272351641 +0100
-+++ trunk/lib/setup-storage/Parser.pm 2011-02-11 11:09:58.512343111 +0100
+--- trunk.orig/lib/setup-storage/Parser.pm 2011-02-11 11:25:13.924842314 +0100
++++ trunk/lib/setup-storage/Parser.pm 2011-02-11 11:25:23.180842395 +0100
@@ -590,6 +590,10 @@
{
$FAI::configs{$FAI::device}{partitions}{$_}{size}{always_format} = 1 foreach (split(",", $1));
@@ -185,8 +174,8 @@
Index: trunk/man/setup-storage.8
===================================================================
---- trunk.orig/man/setup-storage.8 2011-02-11 11:06:30.096370681 +0100
-+++ trunk/man/setup-storage.8 2011-02-11 11:09:58.512343111 +0100
+--- trunk.orig/man/setup-storage.8 2011-02-11 11:25:13.916862776 +0100
++++ trunk/man/setup-storage.8 2011-02-11 11:25:23.180842395 +0100
@@ -284,6 +284,20 @@
.br
*/
Modified: branches/experimental/patches/setup-storage_user-100-percent
===================================================================
--- branches/experimental/patches/setup-storage_user-100-percent 2011-02-11 10:23:03 UTC (rev 6285)
+++ branches/experimental/patches/setup-storage_user-100-percent 2011-02-11 10:29:15 UTC (rev 6286)
@@ -5,8 +5,8 @@
user).
Index: trunk/lib/setup-storage/Sizes.pm
===================================================================
---- trunk.orig/lib/setup-storage/Sizes.pm 2011-02-11 11:15:42.788846341 +0100
-+++ trunk/lib/setup-storage/Sizes.pm 2011-02-11 11:15:50.992348115 +0100
+--- trunk.orig/lib/setup-storage/Sizes.pm 2011-02-11 11:27:21.832346051 +0100
++++ trunk/lib/setup-storage/Sizes.pm 2011-02-11 11:27:26.008342021 +0100
@@ -296,13 +296,14 @@
# @param $current_disk Current config of this disk
# @param $next_start Start of the next partition
@@ -76,9 +76,9 @@
$current_disk->{sector_size};
+ $min_req_total_space += $next_start;
- } elsif ($FAI::configs{$config}{disklabel} eq "gpt") {
- # on GPT-EFI disk labels the first 34 and last 33 sectors must be left alone
-@@ -680,6 +681,11 @@
+ # the MBR requires space, too
+ $min_req_total_space += $current_disk->{bios_sectors_per_track} *
+@@ -684,6 +685,11 @@
$min_req_total_space += 33 * $current_disk->{sector_size};
}
@@ -90,7 +90,7 @@
# the list of partitions that we need to find start and end bytes for
my @worklist = (&numsort(keys %{ $FAI::configs{$config}{partitions} }));
-@@ -726,13 +732,14 @@
+@@ -730,13 +736,14 @@
# the partition $part_id must be preserved
} elsif ($part->{size}->{preserve}) {
($next_start, $min_req_total_space) = &FAI::do_partition_preserve($part_id,
More information about the Fai-commit
mailing list