summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-10-26 13:06:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-10-26 13:06:51 +0000
commitf491ebbba3c4256b7b358a59516d0225ea7e5436 (patch)
tree42b76731a7208a3dba26a93aaf69bfc1b42c8446
parent7a534fa8d1e05bb1023accb094b80055b948754b (diff)
downloaddrakx-f491ebbba3c4256b7b358a59516d0225ea7e5436.tar
drakx-f491ebbba3c4256b7b358a59516d0225ea7e5436.tar.gz
drakx-f491ebbba3c4256b7b358a59516d0225ea7e5436.tar.bz2
drakx-f491ebbba3c4256b7b358a59516d0225ea7e5436.tar.xz
drakx-f491ebbba3c4256b7b358a59516d0225ea7e5436.zip
no adjust start and end on GPT
-rw-r--r--perl-install/partition_table_gpt.pm3
-rw-r--r--perl-install/partition_table_raw.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/partition_table_gpt.pm b/perl-install/partition_table_gpt.pm
index 4662d58a8..4a0514d8e 100644
--- a/perl-install/partition_table_gpt.pm
+++ b/perl-install/partition_table_gpt.pm
@@ -225,6 +225,9 @@ sub raw_add {
push @$raw, $part;
}
+sub adjustStart {}
+sub adjustEnd {}
+
sub first_usable_sector {
my ($hd) = @_;
$hd->{primary}{info}{firstUsableLBA};
diff --git a/perl-install/partition_table_raw.pm b/perl-install/partition_table_raw.pm
index 5dfc82e74..1087d7fbb 100644
--- a/perl-install/partition_table_raw.pm
+++ b/perl-install/partition_table_raw.pm
@@ -77,7 +77,7 @@ sub adjustStart($$) {
sub adjustEnd($$) {
my ($hd, $part) = @_;
my $end = $part->{start} + $part->{size};
- $end == $hd->{totalsectors} and return;
+ $end > $hd->{geom}{cylinders} * cylinder_size($hd) && $end <= $hd->{totalsectors} and return;
my $end1 = round_down($end, cylinder_size($hd));
my $end2 = round_up($end - ($hd->{geom}{heads} > 2 ? 2 : 1) * $hd->{geom}{sectors}, cylinder_size($hd));
$end2 <= $hd->{geom}{cylinders} * cylinder_size($hd) or die "adjustEnd go beyond end of device geometry ($end2 > $hd->{totalsectors})";