From 262903f3d6dc8c5b245ba4931a0f3cf55c6f915b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 18 Apr 2000 23:08:50 +0000
Subject: no_comment

---
 perl-install/standalone/drakboot | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'perl-install/standalone/drakboot')

diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 33af4079a..6171c5a30 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -12,13 +12,16 @@ use c;
 
 local $_ = join '', @ARGV;
 
-/-h/ and die "usage: drakboot\n";
+/-h/ and die "usage: drakboot [--expert]\n";
 
+$::expert = /-expert/;
 $::isStandalone = 1;
 
 my $in = vnew interactive('su');
 
 my $bootloader = lilo::read('', '/etc/lilo.conf');
+local ($_) = `detectloader`;
+$bootloader->{methods} = { lilo => 1, grub => !!/grub/i };
 
 my $hds = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 };
 my $fstab = [ fsedit::get_fstab(@$hds) ];
@@ -27,11 +30,9 @@ fs::get_mntpoints_from_fstab($fstab);
 ask:
 any::setupBootloader($in, $bootloader, $hds, $fstab, $ENV{SECURE_LEVEL}) or $in->exit(0);
 
-eval { lilo::install('', $bootloader) };
-my $err = $@;
-eval { lilo::install_grub('', $bootloader, $fstab, $hds) };
+eval { lilo::install('', $bootloader, $fstab, $hds) };
 
-if ($err && $@) {
+if ($@) {
     $in->ask_warn('', 
 		 [ _("Installation of LILO failed. The following error occured:"),
 		   grep { !/^Warning:/ } cat_("/tmp/.error") ]);
-- 
cgit v1.2.1