summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-18 09:02:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-18 09:02:42 +0000
commit4f7197a536b57f1ff65e5e6f5cc4e0b9cbc28824 (patch)
tree8acc7660ebc279b85c9cf27362e8d0410cecd36e /perl-install/standalone
parent5f505f676af457ac8e248b1b245706a35feb2ba5 (diff)
downloaddrakx-4f7197a536b57f1ff65e5e6f5cc4e0b9cbc28824.tar
drakx-4f7197a536b57f1ff65e5e6f5cc4e0b9cbc28824.tar.gz
drakx-4f7197a536b57f1ff65e5e6f5cc4e0b9cbc28824.tar.bz2
drakx-4f7197a536b57f1ff65e5e6f5cc4e0b9cbc28824.tar.xz
drakx-4f7197a536b57f1ff65e5e6f5cc4e0b9cbc28824.zip
- any::setupBootloader() used to call bootloader::install() whereas install_steps_interactive::setupBootloader() could call it once again (but this code seems dead though)
- create any::installBootloader() out of what was done in the end of any::setupBootloader() but also in install_steps_interactive and drakboot (which handled the error that could occur in bootloader::install())
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;
}