summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-05-19 03:02:45 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-05-19 03:02:45 +0000
commit151e38cb69a3938924baa474db6f98218200591b (patch)
treeed4277ea2a1ec45591cac6f71ec6e2fa923835bc /perl-install
parent899e400bc1962be37655f6d61e54fcc0317e3188 (diff)
downloaddrakx-151e38cb69a3938924baa474db6f98218200591b.tar
drakx-151e38cb69a3938924baa474db6f98218200591b.tar.gz
drakx-151e38cb69a3938924baa474db6f98218200591b.tar.bz2
drakx-151e38cb69a3938924baa474db6f98218200591b.tar.xz
drakx-151e38cb69a3938924baa474db6f98218200591b.zip
(adsl_detect) detect more ADSL USB modems
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/adsl.pm16
1 files changed, 10 insertions, 6 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index b69261f99..c862b6f23 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -84,13 +84,17 @@ sub adsl_probe_info {
}
sub adsl_detect() {
- my $adsl = {};
require detect_devices;
- @{$adsl->{bewan}} = detect_devices::getBewan();
- @{$adsl->{speedtouch}} = detect_devices::getSpeedtouch();
- @{$adsl->{sagem}} = detect_devices::getSagem();
- @{$adsl->{eci}} = detect_devices::getECI();
- return $adsl;
+ my %compat = (
+ 'speedtch' => 'speedtouch',
+ 'eagle-usb' => 'sagem',
+ );
+
+ return {
+ bewan => [ detect_devices::getBewan() ],
+ eci => [ detect_devices::getECI() ],
+ map { my $drv = $_->{driver}; $drv = $compat{$drv} || $drv; $drv => $_ } modules::probe_category('network/usb_dsl'),
+ };
}
sub sagem_set_parameters {