From ce17d3a6903a20969719dcab8fbb7b22ccd2d8e6 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 25 Jun 2004 05:31:52 +0000 Subject: adapt to new bootloader.pm --- perl-install/standalone/drakboot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'perl-install/standalone') diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 21622e21f..7671271a7 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -236,13 +236,13 @@ $in->exit(0); sub lilo_choice() { - my $bootloader = bootloader::read(); - my $all_hds = fsedit::get_hds(); fs::get_raw_hds('', $all_hds); fs::get_info_from_fstab($all_hds, ''); my $fstab = [ fsedit::get_all_fstab($all_hds) ]; + my $bootloader = bootloader::read($fstab); + ask: eval { my $before = fs::fstab_to_string($all_hds); @@ -257,7 +257,7 @@ sub lilo_choice() { # BUG: note that the following message won't speak about the right bootloader if user is currently switching between # various bootloaders and if the error occured before boot sector get overwritten by bootloader installer $in->ask_warn(N("Error"), - [ N("Installation of %s failed. The following error occured:", bootloader::detect_bootloader()), $err ]); + [ N("Installation of %s failed. The following error occured:", $bootloader->{method}), $err ]); goto ask; } } -- cgit v1.2.1