diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-08-01 11:31:45 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-08-01 11:31:45 +0000 |
| commit | 5741eec64d02381676f5aab89ad23e2413eabbd0 (patch) | |
| tree | c4302bbd1e654ff49195d0d05be5c12a8d55d4ba /perl-install/install_steps.pm | |
| parent | 11647c80f3898d05df4e3deedc2f415c02632bbf (diff) | |
| download | drakx-backup-do-not-use-5741eec64d02381676f5aab89ad23e2413eabbd0.tar drakx-backup-do-not-use-5741eec64d02381676f5aab89ad23e2413eabbd0.tar.gz drakx-backup-do-not-use-5741eec64d02381676f5aab89ad23e2413eabbd0.tar.bz2 drakx-backup-do-not-use-5741eec64d02381676f5aab89ad23e2413eabbd0.tar.xz drakx-backup-do-not-use-5741eec64d02381676f5aab89ad23e2413eabbd0.zip | |
get rid of some $prefix parameter passing (using $::prefix where needed instead)
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index a7a0cf57c..9995f2b52 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -773,7 +773,7 @@ sub readBootloaderConfigBeforeInstall { my ($image, $v); require bootloader; - add2hash($o->{bootloader} ||= {}, bootloader::read($o->{prefix}, arch() =~ /sparc/ ? "/etc/silo.conf" : arch() =~ /ppc/ ? "/etc/yaboot.conf" : "/etc/lilo.conf")); + add2hash($o->{bootloader} ||= {}, bootloader::read()); #- 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 @@ -838,7 +838,7 @@ sub setupBootloaderBefore { my $p = pkgs::packageByName($o->{packages}, $_); $p && $p->flag_installed; } 'Aurora', 'bootsplash'; - bootloader::suggest($o->{prefix}, $o->{bootloader}, $o->{all_hds}{hds}, $o->{fstab}, + bootloader::suggest($o->{bootloader}, $o->{all_hds}{hds}, $o->{fstab}, vga_fb => ($force_vga || $vga && $need_fb) && $o->{vga}, quiet => $o->{meta_class} ne 'server'); bootloader::suggest_floppy($o->{bootloader}) if $o->{security} <= 3 && arch() !~ /ppc/; |