summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-11 23:15:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-11 23:15:29 +0000
commit57a6d09b9681ea4b2db7c07848b87a1101eb0e68 (patch)
treefefe7a8cbd895bdb6fafc4d232550e2619cc1428
parent933aa8acdaaee60500831ad27b0beeb3b35f310a (diff)
downloaddrakx-57a6d09b9681ea4b2db7c07848b87a1101eb0e68.tar
drakx-57a6d09b9681ea4b2db7c07848b87a1101eb0e68.tar.gz
drakx-57a6d09b9681ea4b2db7c07848b87a1101eb0e68.tar.bz2
drakx-57a6d09b9681ea4b2db7c07848b87a1101eb0e68.tar.xz
drakx-57a6d09b9681ea4b2db7c07848b87a1101eb0e68.zip
booh, fpons was faster than me on "bootsplash wanting fb". Keeping my solution ;p
-rw-r--r--perl-install/install_steps.pm10
1 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 1a06d5648..7d1929731 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -821,13 +821,11 @@ sub setupBootloaderBefore {
detect_devices::matching_desc('GeForce.*Integrated') #- needed for fbdev driver (hack).
);
- #- propose the default fb mode for kernel fb, if aurora is installed too.
- my $need_fb;
- foreach (qw(Aurora bootsplash)) {
+ #- propose the default fb mode for kernel fb, if aurora or bootsplash is installed.
+ my $need_fb = grep {
my $p = pkgs::packageByName($o->{packages}, $_);
- $p && pkgs::packageFlagInstalled($p) and $need_fb = 1;
- }
-
+ $p && pkgs::packageFlagInstalled($p);
+ } 'Aurora', 'bootsplash';
bootloader::suggest($o->{prefix}, $o->{bootloader}, $o->{all_hds}{hds}, $o->{fstab},
($force_vga || $vga && $need_fb) && $o->{vga});
bootloader::suggest_floppy($o->{bootloader}) if $o->{security} <= 3 && arch() !~ /ppc/;