| 1 |
2010-09-17 Michael Tautschnig <mt@debian.org>
|
| 2 |
|
| 3 |
* setup-storage/{Parser.pm,Sizes.pm}: Make extra partition for gpt-bios the
|
| 4 |
first one.
|
| 5 |
Index: trunk/lib/setup-storage/Parser.pm
|
| 6 |
===================================================================
|
| 7 |
--- trunk.orig/lib/setup-storage/Parser.pm 2011-02-11 11:27:19.048345780 +0100
|
| 8 |
+++ trunk/lib/setup-storage/Parser.pm 2011-02-11 11:27:21.832346051 +0100
|
| 9 |
@@ -615,6 +615,20 @@
|
| 10 |
# supported by parted could be allowed, but others are not implemented
|
| 11 |
# yet
|
| 12 |
$FAI::configs{$FAI::device}{disklabel} = $1;
|
| 13 |
+
|
| 14 |
+ # on gpt-bios we'll need an partition at the very beginning to store what
|
| 15 |
+ # doesn't fit in the MBR
|
| 16 |
+ if ($1 eq "gpt-bios") {
|
| 17 |
+ &FAI::init_part_config("primary");
|
| 18 |
+ $FAI::configs{$FAI::device}{gpt_bios_part} = $FAI::partition_pointer->{number};
|
| 19 |
+ my $s = &FAI::convert_unit("1MiB");
|
| 20 |
+ # enter the range into the hash
|
| 21 |
+ $FAI::partition_pointer->{size}->{range} = "$s-$s";
|
| 22 |
+ # set proper defaults
|
| 23 |
+ $FAI::partition_pointer->{encrypt} = 0;
|
| 24 |
+ $FAI::partition_pointer->{filesystem} = "-";
|
| 25 |
+ $FAI::partition_pointer->{mountpoint} = "-";
|
| 26 |
+ }
|
| 27 |
}
|
| 28 |
| /^bootable:(\d+)/
|
| 29 |
{
|
| 30 |
Index: trunk/lib/setup-storage/Sizes.pm
|
| 31 |
===================================================================
|
| 32 |
--- trunk.orig/lib/setup-storage/Sizes.pm 2011-02-11 11:27:11.688342830 +0100
|
| 33 |
+++ trunk/lib/setup-storage/Sizes.pm 2011-02-11 11:27:21.832346051 +0100
|
| 34 |
@@ -682,19 +682,6 @@
|
| 35 |
|
| 36 |
# the space required by the GPTs
|
| 37 |
$min_req_total_space += 33 * $current_disk->{sector_size};
|
| 38 |
-
|
| 39 |
- # on gpt-bios we'll need an additional partition to store what doesn't fit
|
| 40 |
- # in the MBR
|
| 41 |
- $FAI::device = $config;
|
| 42 |
- &FAI::init_part_config("primary");
|
| 43 |
- $FAI::configs{$config}{gpt_bios_part} = $FAI::partition_pointer->{number};
|
| 44 |
- my $s = &FAI::convert_unit("120KiB");
|
| 45 |
- # enter the range into the hash
|
| 46 |
- $FAI::partition_pointer->{size}->{range} = "$s-$s";
|
| 47 |
- # set proper defaults
|
| 48 |
- $FAI::partition_pointer->{encrypt} = 0;
|
| 49 |
- $FAI::partition_pointer->{filesystem} = "-";
|
| 50 |
- $FAI::partition_pointer->{mountpoint} = "-";
|
| 51 |
}
|
| 52 |
|
| 53 |
# the list of partitions that we need to find start and end bytes for
|
Parent Directory
| 
Revision Log