summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-05 10:36:27 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-05 10:36:27 +0000
commitb60f507adb161461fee9409618ddda390effa840 (patch)
treed40e252071ab2f1de131af0e50e44234b9ea39c0
parentd994b1cbfc01ff23091c55d90097cafd80fd432d (diff)
downloaddrakx-backup-do-not-use-b60f507adb161461fee9409618ddda390effa840.tar
drakx-backup-do-not-use-b60f507adb161461fee9409618ddda390effa840.tar.gz
drakx-backup-do-not-use-b60f507adb161461fee9409618ddda390effa840.tar.bz2
drakx-backup-do-not-use-b60f507adb161461fee9409618ddda390effa840.tar.xz
drakx-backup-do-not-use-b60f507adb161461fee9409618ddda390effa840.zip
a few more fixes (thanks Jure Repinc & Richard Burt)
-rwxr-xr-xperl-install/standalone/drakboot5
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index d1b1c02aa..320c1fe79 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -36,8 +36,7 @@ goto ask;
sub lilo_choice
{
- my $bootloader = bootloader::read;
- #- (no use since bootloader::read was modified) # arch() =~ /ppc/ ? bootloader::read('','/etc/yaboot.conf') : bootloader::read('','/etc/lilo.conf');
+ my $bootloader = bootloader::read();
local ($_) = `detectloader`;
$bootloader->{methods} = { lilo => 1, grub => !!/grub/i, if_(arch() =~ /ppc/, yaboot => 1) };
@@ -50,7 +49,7 @@ sub lilo_choice
ask:
local $::isEmbedded = 0;
any::setupBootloader($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL}) or return;
- eval { bootloader::install('', $bootloader, $fstab, $all_hds->{hds}) };
+ eval { bootloader::install($bootloader, $fstab, $all_hds->{hds}) };
my $loader = arch() =~ /ppc/ ? "Yaboot" : "LILO";
if ($@) {