summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-04-03 12:10:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-04-03 12:10:48 +0000
commitc5eeccdc22c96acac8523d1fc2e2eaabe6093ad4 (patch)
tree035e869ef31c575a3a78f24a5cd0b70a8e1fa372 /perl-install
parent9f7ea0894bc2510062610d9f0affed12ec2d9b4a (diff)
downloaddrakx-c5eeccdc22c96acac8523d1fc2e2eaabe6093ad4.tar
drakx-c5eeccdc22c96acac8523d1fc2e2eaabe6093ad4.tar.gz
drakx-c5eeccdc22c96acac8523d1fc2e2eaabe6093ad4.tar.bz2
drakx-c5eeccdc22c96acac8523d1fc2e2eaabe6093ad4.tar.xz
drakx-c5eeccdc22c96acac8523d1fc2e2eaabe6093ad4.zip
(setupBootloaderBefore): nicer Aurora presence detetection
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps.pm7
1 files changed, 5 insertions, 2 deletions
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});