summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-08 12:20:27 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-08 12:20:27 +0000
commit8c412dc060f08f6fff270fe2e8de27324adadf3f (patch)
tree59f4632e19619beef37e414c07714ee4c95c5f18
parent698eba40c93e25cbd0ed79a71b3be3a507407966 (diff)
downloaddrakx-8c412dc060f08f6fff270fe2e8de27324adadf3f.tar
drakx-8c412dc060f08f6fff270fe2e8de27324adadf3f.tar.gz
drakx-8c412dc060f08f6fff270fe2e8de27324adadf3f.tar.bz2
drakx-8c412dc060f08f6fff270fe2e8de27324adadf3f.tar.xz
drakx-8c412dc060f08f6fff270fe2e8de27324adadf3f.zip
(setupBootloaderBefore): aurora stupid renaming fix
-rw-r--r--perl-install/install_steps.pm8
1 files changed, 4 insertions, 4 deletions
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});
}
}