summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-02-11 18:15:48 +0000
committerFrancois Pons <fpons@mandriva.com>2002-02-11 18:15:48 +0000
commit3620656045aeedf4d3452f0f8d1e564c3e2cf95c (patch)
tree8764287ad914b52508a992ec1deb09a777dc9225
parent9afe41047d80b80f354dcfb885142ccb8301e11b (diff)
downloaddrakx-backup-do-not-use-3620656045aeedf4d3452f0f8d1e564c3e2cf95c.tar
drakx-backup-do-not-use-3620656045aeedf4d3452f0f8d1e564c3e2cf95c.tar.gz
drakx-backup-do-not-use-3620656045aeedf4d3452f0f8d1e564c3e2cf95c.tar.bz2
drakx-backup-do-not-use-3620656045aeedf4d3452f0f8d1e564c3e2cf95c.tar.xz
drakx-backup-do-not-use-3620656045aeedf4d3452f0f8d1e564c3e2cf95c.zip
added Aurora or bootsplash for getting a need on frame buffer.
-rw-r--r--perl-install/install_steps.pm12
1 files changed, 7 insertions, 5 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 52911f785..1a06d5648 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -822,12 +822,14 @@ sub setupBootloaderBefore {
);
#- propose the default fb mode for kernel fb, if aurora is installed too.
- my $has_aurora = do {
- my $p = pkgs::packageByName($o->{packages}, 'Aurora');
- $p && pkgs::packageFlagInstalled($p);
- };
+ my $need_fb;
+ foreach (qw(Aurora bootsplash)) {
+ my $p = pkgs::packageByName($o->{packages}, $_);
+ $p && pkgs::packageFlagInstalled($p) and $need_fb = 1;
+ }
+
bootloader::suggest($o->{prefix}, $o->{bootloader}, $o->{all_hds}{hds}, $o->{fstab},
- ($force_vga || $vga && $has_aurora) && $o->{vga});
+ ($force_vga || $vga && $need_fb) && $o->{vga});
bootloader::suggest_floppy($o->{bootloader}) if $o->{security} <= 3 && arch() !~ /ppc/;
$o->{bootloader}{keytable} ||= keyboard::keyboard2kmap($o->{keyboard});