summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-02-26 17:21:55 +0000
committerOlivier Blin <oblin@mandriva.com>2008-02-26 17:21:55 +0000
commitf67e4952fd97e9f8342159b3ce27009dd473a0c9 (patch)
tree71db184a9de705f09acd050bff6b10aba4f66071
parent516e0d2259aca872209899734ed9bdae91aca614 (diff)
downloaddrakx-net-f67e4952fd97e9f8342159b3ce27009dd473a0c9.tar
drakx-net-f67e4952fd97e9f8342159b3ce27009dd473a0c9.tar.gz
drakx-net-f67e4952fd97e9f8342159b3ce27009dd473a0c9.tar.bz2
drakx-net-f67e4952fd97e9f8342159b3ce27009dd473a0c9.tar.xz
drakx-net-f67e4952fd97e9f8342159b3ce27009dd473a0c9.zip
do not enable by default devices that require slow hardware check (like cellular cards)
-rw-r--r--lib/network/connection_manager.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm
index a705c61..00a2383 100644
--- a/lib/network/connection_manager.pm
+++ b/lib/network/connection_manager.pm
@@ -37,7 +37,9 @@ sub check_setup {
my ($cmanager) = @_;
$cmanager->{connection}{passed_setup} =
(!$cmanager->{connection}->can("check_device") ||
- $cmanager->{connection}->check_device)
+ $cmanager->{connection}->check_device) &&
+ (!$cmanager->{connection}->can("check_hardware") ||
+ !$cmanager->{connection}->check_hardware_is_slow && $cmanager->{connection}->check_hardware)
if !defined $cmanager->{connection}{passed_setup};
$cmanager->{connection}{passed_setup};
}