summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-20 15:25:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-20 15:25:15 +0000
commitef912e15b25151ef79173ba7bb7f06c1e17b4138 (patch)
treecba899fde241393536c9edabf8ea9918bc41795a
parentaac7032ff4116a154d224ecd5457d8a043f4106c (diff)
downloaddrakx-backup-do-not-use-ef912e15b25151ef79173ba7bb7f06c1e17b4138.tar
drakx-backup-do-not-use-ef912e15b25151ef79173ba7bb7f06c1e17b4138.tar.gz
drakx-backup-do-not-use-ef912e15b25151ef79173ba7bb7f06c1e17b4138.tar.bz2
drakx-backup-do-not-use-ef912e15b25151ef79173ba7bb7f06c1e17b4138.tar.xz
drakx-backup-do-not-use-ef912e15b25151ef79173ba7bb7f06c1e17b4138.zip
(setupSCSI): don't pcmcia_probe if testing
-rw-r--r--perl-install/install_steps_interactive.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 5d7d2c171..b28a0f247 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -262,7 +262,7 @@ sub setupSCSI {
my ($o, $clicked) = @_;
if (!$::noauto) {
- if ($o->{pcmcia} ||= c::pcmcia_probe()) {
+ if ($o->{pcmcia} ||= !$::testing && c::pcmcia_probe()) {
my $w = $o->wait_message(_("PCMCIA"), _("Configuring PCMCIA cards..."));
modules::configure_pcmcia($o->{pcmcia});
}