summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2003-03-15 15:45:51 +0000
committerFlorent Villard <warly@mandriva.com>2003-03-15 15:45:51 +0000
commitb72dc8b592a44acac8fecfe47d475485162c7ff5 (patch)
tree92abc830feac39f7e162d9574e8f9214b7e26f5e /perl-install/install_steps.pm
parentbad9352db6617835f12292f262952def1207dcb1 (diff)
downloaddrakx-b72dc8b592a44acac8fecfe47d475485162c7ff5.tar
drakx-b72dc8b592a44acac8fecfe47d475485162c7ff5.tar.gz
drakx-b72dc8b592a44acac8fecfe47d475485162c7ff5.tar.bz2
drakx-b72dc8b592a44acac8fecfe47d475485162c7ff5.tar.xz
drakx-b72dc8b592a44acac8fecfe47d475485162c7ff5.zip
fix a fatal error in drakpem in editable mode
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm10
1 files changed, 10 insertions, 0 deletions
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},