From 8c412dc060f08f6fff270fe2e8de27324adadf3f Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 8 Mar 2001 12:20:27 +0000 Subject: (setupBootloaderBefore): aurora stupid renaming fix --- perl-install/install_steps.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'perl-install') diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index fd42d811b..9f119b6e0 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -679,11 +679,11 @@ 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'); bootloader::suggest($o->{prefix}, $o->{bootloader}, $o->{hds}, $o->{fstab}, install_any::kernelVersion($o), - pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, $::expert ? 'Aurora-wsMonitor' : 'Aurora-mwsMonitor') || {}) && $vga); - if (arch() !~ /ppc/) { - bootloader::suggest_floppy($o->{bootloader}) if $o->{security} <= 3; - } + $aurora && pkgs::packageFlagInstalled($aurora) && $vga); + bootloader::suggest_floppy($o->{bootloader}) if $o->{security} <= 3 && arch() !~ /ppc/; + $o->{bootloader}{keytable} ||= keyboard::keyboard2kmap($o->{keyboard}); } } -- cgit v1.2.1