summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/service_harddrake
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-02-25 10:34:52 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-02-25 10:34:52 +0000
commit28842289e8da29d7b7d6c6b1b31b1080dd5dce9d (patch)
treef40c8206da758d94d6f56ff0911cf2f20256b4bd /perl-install/standalone/service_harddrake
parent851e3fd1c0cc0b586ef0d72cab3db560097adc20 (diff)
downloaddrakx-28842289e8da29d7b7d6c6b1b31b1080dd5dce9d.tar
drakx-28842289e8da29d7b7d6c6b1b31b1080dd5dce9d.tar.gz
drakx-28842289e8da29d7b7d6c6b1b31b1080dd5dce9d.tar.bz2
drakx-28842289e8da29d7b7d6c6b1b31b1080dd5dce9d.tar.xz
drakx-28842289e8da29d7b7d6c6b1b31b1080dd5dce9d.zip
don't black out the screen if not needed
Diffstat (limited to 'perl-install/standalone/service_harddrake')
-rwxr-xr-xperl-install/standalone/service_harddrake5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 1c5771143..d6afe8041 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -23,7 +23,7 @@ modules::mergein_conf('/etc/modules.conf');
my $previous_config = -f $last_boot_config && -s $last_boot_config ? Storable::retrieve($last_boot_config) : {};
$previous_config = $$previous_config if ref($previous_config) !~ /HASH/;
my (%config, $wait);
-my $in = interactive->vnew;
+my $in;
# For each hw, class, detect device, compare and offer to reconfigure if needed
foreach (@harddrake::data::tree) {
@@ -65,6 +65,7 @@ foreach (@harddrake::data::tree) {
if ($no) {
require interactive;
undef $wait;
+ $in ||= interactive->vnew;
$wait = $in->wait_message(N("Please wait"), N("Hardware probing in progress"));
} elsif ($res) {
if (fork()) {
@@ -81,4 +82,4 @@ Storable::store(\%config, $last_boot_config);
harddrake::sound::configure_sound_slots();
modules::write_conf();
-$in->exit(0);
+$in->exit(0) if $in;