summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-10-27 13:03:56 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-10-27 13:03:56 +0000
commit288aea1cb81de0c2441a081244eac225c6053fed (patch)
tree3f31c455325295573ae3c40247fa80987138a83c /perl-install
parentc09c1559c2c04913f951ca6a4cb72d6146142411 (diff)
downloaddrakx-288aea1cb81de0c2441a081244eac225c6053fed.tar
drakx-288aea1cb81de0c2441a081244eac225c6053fed.tar.gz
drakx-288aea1cb81de0c2441a081244eac225c6053fed.tar.bz2
drakx-288aea1cb81de0c2441a081244eac225c6053fed.tar.xz
drakx-288aea1cb81de0c2441a081244eac225c6053fed.zip
split out adsl detection from modem one into its one category
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/harddrake/data.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index b77f637d8..4e642d327 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -63,7 +63,9 @@ our @tree =
my @usbnet = (list_modules::category2modules('network/usb'), "nvnet"); # rought hack for nforce2's nvet
grep { $_->{media_type} && $_->{media_type} =~ /^NETWORK/ || member($_->{driver}, @usbnet) || $_->{type} && $_->{type} eq 'network' } @devices }, 1 ],
- [ "MODEM", , N("Modem"), "modem.png", "", sub { detect_devices::getSpeedtouch(), detect_devices::getSagem(), detect_devices::getModem() }, 0 ],
+ [ "MODEM", , N("Modem"), "modem.png", "", sub { detect_devices::getModem() }, 0 ],
+ [ "ADSL", , N("ADSL adapters"), "modem.png", "", sub {
+ require network::adsl; my $a = network::adsl::adsl_detect(); $a ? values %$a : () }, 0 ],
[ "BRIDGE", , N("Bridges and system controllers"), "memory.png", "", sub { grep { $_->{media_type} =~ /BRIDGE|MEMORY_RAM/ && $_->{driver} ne 'nvnet' } @devices }, 0 ],
[ "UNKNOWN", , N("Unknown/Others"), "unknown.png", "", \&unknown, 0 ],