From 61b8ea5529d457d7f0ee73c8cd58878a29846440 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 19 May 2005 07:27:40 +0000
Subject: (adsl_detect) detect all ADSL modems of each kind (though drakconnect
 is able to configure only one...)

---
 perl-install/network/adsl.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index f2ddacf63..cd82da320 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -84,7 +84,9 @@ sub adsl_probe_info {
 }
 
 sub adsl_detect() {
+    require list_modules;
     require detect_devices;
+    my @modules = list_modules::category2modules('network/usb_dsl');
     my %compat = (
                   'speedtch'  => 'speedtouch',
                   'eagle-usb' => 'sagem',
@@ -93,8 +95,11 @@ sub adsl_detect() {
     return {
             bewan => [ detect_devices::getBewan() ],
             eci   => [ detect_devices::getECI() ],
-            map { my $drv = $_->{driver}; $drv = $compat{$drv} || $drv; $drv => [ $_ ] } modules::probe_category('network/usb_dsl'),
-           };
+            map {
+                my @devices = detect_devices::matching_driver($_);
+                $compat{$_} || $_ => \@devices;
+            } @modules,
+        };
 }
 
 sub sagem_set_parameters {
-- 
cgit v1.2.1