summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-18 09:23:58 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-18 09:23:58 +0000
commit5ff1e05787636680f50387406072d82123154942 (patch)
treebf072bf5e6a2f9b4c97f88f8ca933f39c66caad1
parentc1d5c9d2520872f6c1d48dea3fa6d99a85fdee28 (diff)
downloaddrakx-5ff1e05787636680f50387406072d82123154942.tar
drakx-5ff1e05787636680f50387406072d82123154942.tar.gz
drakx-5ff1e05787636680f50387406072d82123154942.tar.bz2
drakx-5ff1e05787636680f50387406072d82123154942.tar.xz
drakx-5ff1e05787636680f50387406072d82123154942.zip
restrict the wait message (so that it's dead when an error message is displayed)
-rw-r--r--perl-install/any.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index bcc5358ed..cde0da8f4 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -108,11 +108,12 @@ sub installBootloader {
install_acpi_pkgs($in->do_pkgs, $b);
- my $_w = $in->wait_message(N("Please wait"), N("Bootloader installation in progress"));
-
eval { run_program::rooted($::prefix, 'lilo', '-u') } if $::isInstall && !$::o->{isUpgrade} && -e "$::prefix/etc/lilo.conf" && glob("$::prefix/boot/boot.*");
- eval { bootloader::install($b, $all_hds) };
+ eval {
+ my $_w = $in->wait_message(N("Please wait"), N("Bootloader installation in progress"));
+ bootloader::install($b, $all_hds);
+ };
if (my $err = $@) {
$err =~ /wizcancel/ and return;