From c5eeccdc22c96acac8523d1fc2e2eaabe6093ad4 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 3 Apr 2001 12:10:48 +0000 Subject: (setupBootloaderBefore): nicer Aurora presence detetection --- perl-install/install_steps.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'perl-install/install_steps.pm') diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 041371321..176093c3a 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -685,9 +685,12 @@ sub setupBootloaderBefore { require bootloader; #- propose the default fb mode for kernel fb, if aurora is installed too. - my $aurora = pkgs::packageByName($o->{packages}, $::expert ? 'Aurora-Monitor-Traditional-WsLib' : 'Aurora-Monitor-NewStyle-WsLib'); + my $has_aurora = do { + my $p = pkgs::packageByName($o->{packages}, 'Aurora'); + $p && pkgs::packageFlagInstalled($p); + }; bootloader::suggest($o->{prefix}, $o->{bootloader}, $o->{hds}, $o->{fstab}, install_any::kernelVersion($o), - $aurora && pkgs::packageFlagInstalled($aurora) && $vga); + $has_aurora && $vga); bootloader::suggest_floppy($o->{bootloader}) if $o->{security} <= 3 && arch() !~ /ppc/; $o->{bootloader}{keytable} ||= keyboard::keyboard2kmap($o->{keyboard}); -- cgit v1.2.1