summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-10-16 12:27:13 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-10-16 12:27:13 +0000
commit52631406919230cfc1a51893c67f2328f6781f15 (patch)
tree303917011fd233b70e9cfd13b1018913f8ab2af2
parentcf49c7dd43cc29087f206296b1f0a42c7085498d (diff)
downloaddrakx-backup-do-not-use-52631406919230cfc1a51893c67f2328f6781f15.tar
drakx-backup-do-not-use-52631406919230cfc1a51893c67f2328f6781f15.tar.gz
drakx-backup-do-not-use-52631406919230cfc1a51893c67f2328f6781f15.tar.bz2
drakx-backup-do-not-use-52631406919230cfc1a51893c67f2328f6781f15.tar.xz
drakx-backup-do-not-use-52631406919230cfc1a51893c67f2328f6781f15.zip
use code factored in detect_devices for modem detection
-rw-r--r--perl-install/harddrake/data.pm10
1 files changed, 2 insertions, 8 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index e39b1d3ae..7f7cc954e 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -38,9 +38,7 @@ our @tree =
["AUDIO","Soundcard", "sound.png", "$sbindir/draksound",
sub { grep { $_->{media_type} =~ 'MULTIMEDIA_AUDIO' } @devices}, 0 ],
["WEBCAM","Webcam", "webcam.png", "", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} ne 'PCI'} @devices }, 0 ],
- ["CPU","Processors", "cpu.png", "", sub {
- detect_devices::getCPUs();
- }, 0 ],
+ ["CPU","Processors", "cpu.png", "", sub { detect_devices::getCPUs() }, 0 ],
["ETHERNET","Ethernetcard", "hw_network.png", "$sbindir/drakconnect", sub {
#- generic NIC detection for USB seems broken (class, subclass,
#- protocol report are not accurate) so I'll need to verify against
@@ -49,11 +47,7 @@ our @tree =
# should be taken from detect_devices.pm or modules.pm. it's identical
grep { $_->{media_type} =~ /^NETWORK/ || member($_->{driver}, @usbnet) || $_->{type} eq 'network' } @devices}, 1 ],
- ["MODEM","Modem", "modem.png", "", sub { require network::modem;
- my $modem;
- network::modem::modem_detect_backend($modem);
- grep { $modem->{device} } @{ $modem };
- } , 0 ],
+ ["MODEM","Modem", "modem.png", "", sub { detect_devices::getModem() } , 0 ],
["BRIDGE","Bridge(s)", "memory.png", "", sub { grep { $_->{media_type} =~ 'BRIDGE' } @devices}, 0 ],
["UNKNOWN","Unknown/Others", "unknown.png", "" , \&unknown, 0 ],