diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-04-18 23:08:50 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-04-18 23:08:50 +0000 |
| commit | 262903f3d6dc8c5b245ba4931a0f3cf55c6f915b (patch) | |
| tree | 0f188cbc5f370ae2ac580d675de733c9e449822a /perl-install/standalone/drakboot | |
| parent | 10f1c2d98ebcf41baaf8d7bc3963e2ce40014404 (diff) | |
| download | drakx-262903f3d6dc8c5b245ba4931a0f3cf55c6f915b.tar drakx-262903f3d6dc8c5b245ba4931a0f3cf55c6f915b.tar.gz drakx-262903f3d6dc8c5b245ba4931a0f3cf55c6f915b.tar.bz2 drakx-262903f3d6dc8c5b245ba4931a0f3cf55c6f915b.tar.xz drakx-262903f3d6dc8c5b245ba4931a0f3cf55c6f915b.zip | |
no_comment
Diffstat (limited to 'perl-install/standalone/drakboot')
| -rwxr-xr-x | perl-install/standalone/drakboot | 11 |
1 files changed, 6 insertions, 5 deletions
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") ]); |