From b60f507adb161461fee9409618ddda390effa840 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 5 Aug 2002 10:36:27 +0000 Subject: a few more fixes (thanks Jure Repinc & Richard Burt) --- perl-install/standalone/drakboot | 5 ++--- 1 file 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 ($@) { -- cgit v1.2.1