diff options
| author | Stew Benedict <stewb@mandriva.org> | 2001-03-03 01:48:49 +0000 |
|---|---|---|
| committer | Stew Benedict <stewb@mandriva.org> | 2001-03-03 01:48:49 +0000 |
| commit | 091353cf267810593f5c72f014a8d9a6a0d0fbc9 (patch) | |
| tree | f650a50b38ca7a4244b8f39524f9d276655b3bab /perl-install/install_steps.pm | |
| parent | 348d706236d2bf7e09bc8214b657faef0b0a30c5 (diff) | |
| download | drakx-091353cf267810593f5c72f014a8d9a6a0d0fbc9.tar drakx-091353cf267810593f5c72f014a8d9a6a0d0fbc9.tar.gz drakx-091353cf267810593f5c72f014a8d9a6a0d0fbc9.tar.bz2 drakx-091353cf267810593f5c72f014a8d9a6a0d0fbc9.tar.xz drakx-091353cf267810593f5c72f014a8d9a6a0d0fbc9.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 9700b1b5b..8270f663d 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -640,7 +640,7 @@ sub readBootloaderConfigBeforeInstall { my ($image, $v); require bootloader; - add2hash($o->{bootloader} ||= {}, bootloader::read($o->{prefix}, arch() =~ /sparc/ ? "/etc/silo.conf" : "/etc/lilo.conf")); + add2hash($o->{bootloader} ||= {}, bootloader::read($o->{prefix}, arch() =~ /sparc/ ? "/etc/silo.conf" : arch() =~ /ppc/ ? "/etc/yaboot.conf" : "/etc/lilo.conf")); #- since kernel or kernel-smp may not be upgraded, it should be checked #- if there is a need to update existing lilo.conf entries by following @@ -678,7 +678,9 @@ sub setupBootloaderBefore { #- propose the default fb mode for kernel fb, if aurora is installed too. 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; + } $o->{bootloader}{keytable} ||= keyboard::keyboard2kmap($o->{keyboard}); } } |