summaryrefslogtreecommitdiffstats
path: root/perl-install/install_messages.pm
Commit message (Expand)AuthorAgeFilesLines
* perl_checker adaptations + fixesPascal Rigaux2003-04-241-4/+4
* change address for errata to reflect the future 9.1Guillaume Cottenceau2003-02-081-1/+1
* must return a true valueGuillaume Cottenceau2002-12-131-0/+2
* move long messages (like license) to a new package: install_messages.pmPascal Rigaux2002-12-091-0/+142
87636680f50387406072d82123154942.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)
Diffstat
-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;