diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-19 17:47:56 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-19 17:47:56 +0000 |
commit | a6801e08e3d71ed91d46cc96063e14432bc57f38 (patch) | |
tree | b1ba8ae01e3516a0e45aeca77633d4308ab25bdd | |
parent | 40b00a74ea22b475df3cdac63b0e5bcf4127d846 (diff) | |
download | drakx-a6801e08e3d71ed91d46cc96063e14432bc57f38.tar drakx-a6801e08e3d71ed91d46cc96063e14432bc57f38.tar.gz drakx-a6801e08e3d71ed91d46cc96063e14432bc57f38.tar.bz2 drakx-a6801e08e3d71ed91d46cc96063e14432bc57f38.tar.xz drakx-a6801e08e3d71ed91d46cc96063e14432bc57f38.zip |
(detect)
- adapt modem detection to new detect_devices
- keep all data collected on modems
-rw-r--r-- | perl-install/network/netconnect.pm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index f641e1dcb..8c354ee31 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -31,9 +31,7 @@ sub detect { $auto_detect->{adsl} = network::adsl::adsl_detect(); }, modem => sub { - my ($modem, @pci_modems) = detect_devices::getModem(); - $modem->{device} and $auto_detect->{modem} = $modem->{device}; - @pci_modems and $auto_detect->{winmodem}{$_->{driver}} = $_->{description} foreach @pci_modems; + $auto_detect->{modem} = { map { ($_->{device} || $_->{description}) => $_ } detect_devices::getModem() }; }, ); $l{$_}->() foreach ($o_class || (keys %l)); |