diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-02-05 11:08:47 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-02-05 11:08:47 +0000 |
| commit | 967a83f1474941d6a7328fcac33f81bd066a8d5e (patch) | |
| tree | 5d196b689b4fb4ec4d755b2d46c466a15d25c526 /perl-install/install_steps.pm | |
| parent | 64e67d0fd78cea5bcbc5ab41f9377749876405f2 (diff) | |
| download | drakx-967a83f1474941d6a7328fcac33f81bd066a8d5e.tar drakx-967a83f1474941d6a7328fcac33f81bd066a8d5e.tar.gz drakx-967a83f1474941d6a7328fcac33f81bd066a8d5e.tar.bz2 drakx-967a83f1474941d6a7328fcac33f81bd066a8d5e.tar.xz drakx-967a83f1474941d6a7328fcac33f81bd066a8d5e.zip | |
fixed frame buffer usage if not enabled (installation of Aurora)
clean up and remove unused code.
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 4a7d57997..f104ca885 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -649,10 +649,15 @@ sub setupBootloaderBefore { $o->{bootloader}{part_nb} ||= first($dev->{device} =~ /(\d+)/); } } else { + #- check for valid fb mode to enable a default boot with frame buffer. + my $vga = $o->{allowFB} && (!detect_devices::matching_desc('Rage LT') && + !detect_devices::matching_desc('SiS') && + !detect_devices::matching_desc('Rage Mobility')) && $o->{vga}; + require bootloader; #- propose the default fb mode for kernel fb, if aurora is installed too. bootloader::suggest($o->{prefix}, $o->{bootloader}, $o->{hds}, $o->{fstab}, install_any::kernelVersion($o), - pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'Aurora') || {}) && ($o->{vga} || 785)); + pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'Aurora') || {}) && $vga); if ($o->{miscellaneous}{profiles}) { my $e = bootloader::get_label("linux", $o->{bootloader}); push @{$o->{bootloader}{entries}}, { %$e, label => "office", append => "$e->{append} prof=Office" }; |