diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-10-27 13:14:49 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-10-27 13:14:49 +0000 |
| commit | 4cece0e2654c107f8083348cb5f89c52a3c66776 (patch) | |
| tree | e6a587de06f7214636e140ebb83b46c86be17f1d | |
| parent | 288aea1cb81de0c2441a081244eac225c6053fed (diff) | |
| download | drakx-backup-do-not-use-4cece0e2654c107f8083348cb5f89c52a3c66776.tar drakx-backup-do-not-use-4cece0e2654c107f8083348cb5f89c52a3c66776.tar.gz drakx-backup-do-not-use-4cece0e2654c107f8083348cb5f89c52a3c66776.tar.bz2 drakx-backup-do-not-use-4cece0e2654c107f8083348cb5f89c52a3c66776.tar.xz drakx-backup-do-not-use-4cece0e2654c107f8083348cb5f89c52a3c66776.zip | |
list isdn adapters in their own class instead of showing them up as
unknown devices
| -rw-r--r-- | perl-install/harddrake/data.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 4e642d327..7a0e4ea2b 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -13,7 +13,7 @@ my @devices = detect_devices::probeall(); # Update me each time you handle one more devices class (aka configurator) sub unknown() { grep { $_->{media_type} !~ /BRIDGE|class\|Mouse|DISPLAY|Hub|MEMORY_RAM|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|NETWORK|Printer|SERIAL_(USB|SMBUS)|STORAGE_(IDE|OTHER|SCSI)|tape/ - && $_->{driver} !~ /^(ohci1394|scanner|usbvision|mod_quickcam)$|Mouse:USB|class\|Mouse|Removable:zip|www.linmodems.org|nvnet/ + && $_->{driver} !~ /^(ISDN|mod_quickcam|ohci1394|scanner|usbvision)$|Mouse:USB|class\|Mouse|Removable:zip|www.linmodems.org|nvnet/ && $_->{type} ne 'network' && $_->{description} !~ /Alcatel|ADSL Modem/ } @devices; @@ -66,6 +66,8 @@ our @tree = [ "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 ], + [ "ISDN", , N("ISDN adapters"), "modem.png", "", 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 { grep { $_->{media_type} =~ /BRIDGE|MEMORY_RAM/ && $_->{driver} ne 'nvnet' } @devices }, 0 ], [ "UNKNOWN", , N("Unknown/Others"), "unknown.png", "", \&unknown, 0 ], |