summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-05-19 07:27:40 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-05-19 07:27:40 +0000
commit61b8ea5529d457d7f0ee73c8cd58878a29846440 (patch)
tree44f4a59d0bf389c81d6dccb5618cb7c2e873c06a /perl-install/network
parentbd3452473abe9f58d2b96e3e52ec76e03afe4127 (diff)
downloaddrakx-61b8ea5529d457d7f0ee73c8cd58878a29846440.tar
drakx-61b8ea5529d457d7f0ee73c8cd58878a29846440.tar.gz
drakx-61b8ea5529d457d7f0ee73c8cd58878a29846440.tar.bz2
drakx-61b8ea5529d457d7f0ee73c8cd58878a29846440.tar.xz
drakx-61b8ea5529d457d7f0ee73c8cd58878a29846440.zip
(adsl_detect) detect all ADSL modems of each kind (though drakconnect
is able to configure only one...)
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/adsl.pm9
1 files changed, 7 insertions, 2 deletions
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 {