summaryrefslogtreecommitdiffstats
path: root/perl-install/partition_table
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-26 11:23:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-26 11:23:56 +0000
commiteb4cc630c844819c52cf4baddd336f60d220b495 (patch)
treedeca8ee515d5191aa135e01489dd3c54700b4fe7 /perl-install/partition_table
parent7af73fe04e8d49a0a664bd0a8cc40b8930f5167d (diff)
downloaddrakx-eb4cc630c844819c52cf4baddd336f60d220b495.tar
drakx-eb4cc630c844819c52cf4baddd336f60d220b495.tar.gz
drakx-eb4cc630c844819c52cf4baddd336f60d220b495.tar.bz2
drakx-eb4cc630c844819c52cf4baddd336f60d220b495.tar.xz
drakx-eb4cc630c844819c52cf4baddd336f60d220b495.zip
- geometry XXX/240/63 is quite common, so add 240 to @valid_nb_heads
- remove checking that nb_heads is in @valid_nb_heads (this fixes yet another case of the infamous "XP doesn't boot" occuring 10.1 CE, though it should already be fixed via EDD)
Diffstat (limited to 'perl-install/partition_table')
-rw-r--r--perl-install/partition_table/dos.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/partition_table/dos.pm b/perl-install/partition_table/dos.pm
index 23164a286..025dac4cb 100644
--- a/perl-install/partition_table/dos.pm
+++ b/perl-install/partition_table/dos.pm
@@ -109,7 +109,7 @@ sub is_geometry_valid_for_the_partition_table {
#- from parted, thanks!
my @valid_nb_sectors = (63, 61, 48, 32, 16);
-my @valid_nb_heads = (255, 192, 128, 96, 64, 61, 32, 17, 16);
+my @valid_nb_heads = (255, 240, 192, 128, 96, 64, 61, 32, 17, 16);
sub guess_geometry_from_partition_table {
my ($hd) = @_;
@@ -120,7 +120,7 @@ sub guess_geometry_from_partition_table {
partition_table::raw::compute_nb_cylinders($geom, $hd->{totalsectors});
log::l("guess_geometry_from_partition_table $hd->{device}: " . geometry_to_string($geom));
- member($geom->{heads}, @valid_nb_heads) && member($geom->{sectors}, @valid_nb_sectors) or return { invalid => 1 };
+ member($geom->{sectors}, @valid_nb_sectors) or return { invalid => 1 };
$geom;
}