diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-04-07 13:52:22 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-04-07 13:52:22 +0000 |
commit | 91d2c75a7dadf58665281600591a484c6e34b077 (patch) | |
tree | 130e62b3beb1ff07565dcdec9195202d6edef070 /perl-install/standalone/drakboot | |
parent | 4e4b3a9d0c4bcecd4228c6d6ec8970cadf3c9c37 (diff) | |
download | drakx-backup-do-not-use-91d2c75a7dadf58665281600591a484c6e34b077.tar drakx-backup-do-not-use-91d2c75a7dadf58665281600591a484c6e34b077.tar.gz drakx-backup-do-not-use-91d2c75a7dadf58665281600591a484c6e34b077.tar.bz2 drakx-backup-do-not-use-91d2c75a7dadf58665281600591a484c6e34b077.tar.xz drakx-backup-do-not-use-91d2c75a7dadf58665281600591a484c6e34b077.zip |
fix #2826 (aka pixel sucks):
pixel changed the booloader module api by throwing an exception
instead of using the ugly /tmp/.error temporary file and altered drakx
callers but forget to update standalone/* callers (aka drakboot).
now, with this patch, any error during lilo/grub installation is
catched and displayed, which is more generic than checking for spaces.
Diffstat (limited to 'perl-install/standalone/drakboot')
-rwxr-xr-x | perl-install/standalone/drakboot | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 63d92dba0..81f566b4d 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -328,15 +328,15 @@ sub lilo_choice { ask: local $::isEmbedded = 0; - any::setupBootloader($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL}) or return; - eval { bootloader::install($bootloader, $fstab, $all_hds->{hds}) }; - + eval { + any::setupBootloader($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL}); + bootloader::install($bootloader, $fstab, $all_hds->{hds}); + }; my $loader = arch() =~ /ppc/ ? "Yaboot" : "LILO"; - if ($@) { + my $err = $@; + if ($err) { $in->ask_warn('', - [ N("Installation of %s failed. The following error occured:", $loader), - grep { !/^Warning:/ } cat_("/tmp/.error") ]); - unlink "/tmp/.error"; + [ N("Installation of %s failed. The following error occured:", $loader), $err ]); goto ask; } } |