summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/drakboot21
1 files changed, 6 insertions, 15 deletions
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 2e077eca4..5a66f3de4 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -228,22 +228,13 @@ $in->exit(0);
sub lilo_choice() {
ask:
- eval {
- my $before = fs::fstab_to_string($all_hds);
- any::setupBootloader($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL});
- if ($before ne fs::fstab_to_string($all_hds)) {
- #- for /tmp using tmpfs when "clean /tmp" is chosen
- fs::write_fstab($all_hds);
- }
- };
- my $err = $@;
- if ($err && $err !~ /wizcancel/) {
- # 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->{method}), $err ]);
- goto ask;
+ my $before = fs::fstab_to_string($all_hds);
+ any::setupBootloader($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL});
+ if ($before ne fs::fstab_to_string($all_hds)) {
+ #- for /tmp using tmpfs when "clean /tmp" is chosen
+ fs::write_fstab($all_hds);
}
+ any::installBootloader($in, $bootloader, $all_hds) or goto ask;
}