From f67e4952fd97e9f8342159b3ce27009dd473a0c9 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 26 Feb 2008 17:21:55 +0000
Subject: do not enable by default devices that require slow hardware check
 (like cellular cards)

---
 lib/network/connection_manager.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/network/connection_manager.pm')

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};
 }
-- 
cgit v1.2.1