diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-03-18 10:37:44 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-03-18 10:37:44 +0000 |
| commit | f5fb9a914d3637d1735a71daf563c2dc465f2d65 (patch) | |
| tree | 6ddec089e8f581b3ea291e36ce70d88cb5405f01 | |
| parent | 115d345b3d41b87fb118e4130eafbec570ab0950 (diff) | |
| download | drakx-f5fb9a914d3637d1735a71daf563c2dc465f2d65.tar drakx-f5fb9a914d3637d1735a71daf563c2dc465f2d65.tar.gz drakx-f5fb9a914d3637d1735a71daf563c2dc465f2d65.tar.bz2 drakx-f5fb9a914d3637d1735a71daf563c2dc465f2d65.tar.xz drakx-f5fb9a914d3637d1735a71daf563c2dc465f2d65.zip | |
not guessing a geometry when default_ok is no big deal
| -rw-r--r-- | perl-install/partition_table/dos.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/partition_table/dos.pm b/perl-install/partition_table/dos.pm index 5ba3c940f..86f2c0256 100644 --- a/perl-install/partition_table/dos.pm +++ b/perl-install/partition_table/dos.pm @@ -151,15 +151,16 @@ sub set_best_geometry_for_the_partition_table { log::l("$hd->{device}: would need looking at BIOS info to find out geometry"); return; } + my $default_ok = is_geometry_valid_for_the_partition_table($hd, $hd->{geom}, 0); if ($guessed_geom->{invalid}) { log::l("$hd->{device}: no valid geometry guessed from partition table"); + $default_ok and return; $guessed_geom = try_every_geometry($hd) or return; } if ($guessed_geom->{heads} == $hd->{geom}{heads} && $guessed_geom->{sectors} == $hd->{geom}{sectors}) { # cool! } else { - my $default_ok = is_geometry_valid_for_the_partition_table($hd, $hd->{geom}, 0); my $guessed_ok = is_geometry_valid_for_the_partition_table($hd, $guessed_geom, 0); if ($default_ok && $guessed_ok) { #- oh my!? |