summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-14 02:55:42 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-14 02:55:42 +0000
commit8f691844ca8db7244433bd613a05f7ce25b7b63e (patch)
tree59ad17846576c6e9ff97ad794b15ce3150d40078
parent6c3307d3ffe6d35da0930c6fbe43eabdf5c43a9c (diff)
downloaddrakx-8f691844ca8db7244433bd613a05f7ce25b7b63e.tar
drakx-8f691844ca8db7244433bd613a05f7ce25b7b63e.tar.gz
drakx-8f691844ca8db7244433bd613a05f7ce25b7b63e.tar.bz2
drakx-8f691844ca8db7244433bd613a05f7ce25b7b63e.tar.xz
drakx-8f691844ca8db7244433bd613a05f7ce25b7b63e.zip
fix ISDN detection (#6535)
-rw-r--r--perl-install/harddrake/data.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 6b652d437..71b9f3cd7 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -66,6 +66,7 @@ our @tree =
member($_->{driver}, qw(cpia_usb cyber2000fb ibmcam mod_quickcam ov511 ov518_decomp ultracam usbvideo)) } @devices) },
0 ],
[ "CPU", , N("Processors"), "cpu.png", "", sub { detect_devices::getCPUs() }, 0 ],
+ [ "ISDN", , N("ISDN adapters"), "modem.png", "$sbindir/drakconnect", sub { require network::isdn; my $isdn = network::isdn::isdn_detect_backend();
[ "ETHERNET", , N("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
@@ -77,7 +78,6 @@ our @tree =
[ "MODEM", , N("Modem"), "modem.png", "$sbindir/drakconnect", sub { detect_devices::getModem() }, 0 ],
[ "ADSL", , N("ADSL adapters"), "modem.png", "$sbindir/drakconnect", sub {
require network::adsl; my $a = network::adsl::adsl_detect(); $a ? f(grep { $_ } values %$a) : () }, 0 ],
- [ "ISDN", , N("ISDN adapters"), "modem.png", "$sbindir/drakconnect", sub { require network::isdn; my $isdn = network::isdn::isdn_detect_backend();
if_(!is_empty_hash_ref($isdn), $isdn) }, 0 ],
[ "BRIDGE", , N("Bridges and system controllers"), "memory.png", "", sub { f(grep { $_->{media_type} =~ /BRIDGE|MEMORY_RAM/ && $_->{driver} ne 'nvnet' } @devices) }, 0 ],
[ "PRINTER", , N("Printer"), "hw_printer.png", "$sbindir/printerdrake", sub {