diff options
| author | Frederic Lepied <flepied@mandriva.com> | 2003-03-17 09:57:00 +0000 |
|---|---|---|
| committer | Frederic Lepied <flepied@mandriva.com> | 2003-03-17 09:57:00 +0000 |
| commit | 0f0c6e42f8dd1d67307c92ba960746050766540d (patch) | |
| tree | a38a79256aacdfa23703c229deebddbfd831b6fc /perl-install | |
| parent | 0f2158d02fe433bdef724be81aa2e1b4327c3dfc (diff) | |
| download | drakx-0f0c6e42f8dd1d67307c92ba960746050766540d.tar drakx-0f0c6e42f8dd1d67307c92ba960746050766540d.tar.gz drakx-0f0c6e42f8dd1d67307c92ba960746050766540d.tar.bz2 drakx-0f0c6e42f8dd1d67307c92ba960746050766540d.tar.xz drakx-0f0c6e42f8dd1d67307c92ba960746050766540d.zip | |
reverted to 1.604
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install_steps.pm | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 3912e5d0e..8a7f5578f 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -884,20 +884,10 @@ 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}, |