diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-09-04 16:21:19 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-09-04 16:21:19 +0000 |
| commit | 1ab88fba23f2642451be7063ae4e2fd175a346d2 (patch) | |
| tree | 235766e457319e20c5ec4e3ddfb7b1ddb759138a /perl-install/install_steps.pm | |
| parent | 7fd360ebbd158a9c1c72c01aa60369b762f9d730 (diff) | |
| download | drakx-1ab88fba23f2642451be7063ae4e2fd175a346d2.tar drakx-1ab88fba23f2642451be7063ae4e2fd175a346d2.tar.gz drakx-1ab88fba23f2642451be7063ae4e2fd175a346d2.tar.bz2 drakx-1ab88fba23f2642451be7063ae4e2fd175a346d2.tar.xz drakx-1ab88fba23f2642451be7063ae4e2fd175a346d2.zip | |
fix bad vga= which go for some install.
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 5089beca0..950bbdb90 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -739,9 +739,9 @@ sub setupBootloaderBefore { !detect_devices::matching_desc('S3 Inc') && !detect_devices::matching_desc('Matrox') && !detect_devices::matching_desc('Rage Mobility') - ) && $o->{vga}; + ); my $force_vga = $o->{allowFB} && (detect_devices::matching_desc('SiS.*630') #- SiS 630 need frame buffer. - ) && $o->{vga}; + ); require bootloader; #- propose the default fb mode for kernel fb, if aurora is installed too. @@ -750,7 +750,7 @@ sub setupBootloaderBefore { $p && pkgs::packageFlagInstalled($p); }; bootloader::suggest($o->{prefix}, $o->{bootloader}, $o->{all_hds}{hds}, $o->{fstab}, install_any::kernelVersion($o), - $force_vga || $vga && $has_aurora); + ($force_vga || $vga && $has_aurora) && $o->{vga}); bootloader::suggest_floppy($o->{bootloader}) if $o->{security} <= 3 && arch() !~ /ppc/; $o->{bootloader}{keytable} ||= keyboard::keyboard2kmap($o->{keyboard}); |