summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-02-11 13:11:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-02-11 13:11:54 +0000
commit32a83378c4a49d7b0bf6d574db66b52956a432c3 (patch)
tree37b7b436478f16934669b83a4d6c301f4f62b535 /perl-install/install_steps_interactive.pm
parent4167dc1ad8d3466546f4cfaa84f1f2b4885755aa (diff)
downloaddrakx-32a83378c4a49d7b0bf6d574db66b52956a432c3.tar
drakx-32a83378c4a49d7b0bf6d574db66b52956a432c3.tar.gz
drakx-32a83378c4a49d7b0bf6d574db66b52956a432c3.tar.bz2
drakx-32a83378c4a49d7b0bf6d574db66b52956a432c3.tar.xz
drakx-32a83378c4a49d7b0bf6d574db66b52956a432c3.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm16
1 files changed, 8 insertions, 8 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 2cb1e567f..ed1ca1ecc 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1193,19 +1193,19 @@ You may have to restart installation and give ``%s'' at the prompt", $ide));
}
}
- eval { modules::load_thiskind($type, sub { $w = wait_load_module($o, $type, @_) }, $pcmcia) };
- $@ and $o->errorInStep($@);
+ my @l = eval { modules::load_thiskind($type, sub { $w = wait_load_module($o, $type, @_) }, $pcmcia) };
+ $@ and $o->errorInStep($@), return undef;
+ @l;
}
#------------------------------------------------------------------------------
sub setup_thiskind {
- my ($o, $type, $auto, $at_least_one) = @_;
+ my ($o, $type, $auto, $at_least_one) = @_;
+
+ # load_thiskind returns undef in case of error
+ my @l = $o->load_thiskind($type) if !$::expert || $o->ask_yesorno('', _("Try to find PCI devices?"), 1);
+ return if defined @l && $auto && (@l || !$at_least_one);
- if (!exists $o->{auto_probe_pci}) {
- $o->{auto_probe_pci} = !$::expert || $o->ask_yesorno('', _("Try to find PCI devices?"), 1);
- }
- my @l = $o->load_thiskind($type) if $o->{auto_probe_pci};
- return if $auto && (@l || !$at_least_one);
while (1) {
my $msg = @l ?
[ _("Found %s %s interfaces", join(", ", map { $_->[0] } @l), $type),