From b72dc8b592a44acac8fecfe47d475485162c7ff5 Mon Sep 17 00:00:00 2001 From: Florent Villard Date: Sat, 15 Mar 2003 15:45:51 +0000 Subject: fix a fatal error in drakpem in editable mode --- perl-install/install_steps.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'perl-install/install_steps.pm') diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 8a7f5578f..3912e5d0e 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -884,10 +884,20 @@ sub setupBootloaderBefore { detect_devices::matching_desc('GeForce.*Integrated') #- needed for fbdev driver (hack). ); +<<<<<<< install_steps.pm + #- propose the default fb mode for kernel fb, if aurora is installed too. + my $has_aurora = do { + my $p = pkgs::packageByName($o->{packages}, 'bootsplash'); +======= #- propose the default fb mode for kernel fb, if aurora or bootsplash is installed. my $need_fb = any { my $p = pkgs::packageByName($o->{packages}, $_); +<<<<<<< install_steps.pm +>>>>>>> 1.472 + $p && pkgs::packageFlagInstalled($p); +======= $p && $p->flag_installed; +>>>>>>> 1.504 } 'Aurora', 'bootsplash'; bootloader::suggest($o->{bootloader}, $o->{all_hds}{hds}, $o->{fstab}, vga_fb => ($force_vga || $vga && $need_fb) && $o->{vga}, -- cgit v1.2.1