summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-10-27 11:40:42 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-10-27 11:40:42 +0000
commit6d5f92a475adcd72579387c22dfc85247f94221c (patch)
tree371a64dfe068bc0ca30cb9ac978a5d8b483aa236
parent11a49ceddc36b53c93bc1002f265fa9758974ce5 (diff)
downloaddrakx-backup-do-not-use-6d5f92a475adcd72579387c22dfc85247f94221c.tar
drakx-backup-do-not-use-6d5f92a475adcd72579387c22dfc85247f94221c.tar.gz
drakx-backup-do-not-use-6d5f92a475adcd72579387c22dfc85247f94221c.tar.bz2
drakx-backup-do-not-use-6d5f92a475adcd72579387c22dfc85247f94221c.tar.xz
drakx-backup-do-not-use-6d5f92a475adcd72579387c22dfc85247f94221c.zip
- make isdn detection more readable
- ensure previously detected isdn stuff is cleared on redetection
-rw-r--r--perl-install/network/isdn.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 5d966d8a6..2e8177b37 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -247,7 +247,7 @@ sub isdn_detect {
sub isdn_detect_backend {
my ($isdn) = @_;
if (my ($c) = modules::probe_category('network/isdn')) {
- $isdn->{$_} = $c->{$_} foreach qw(description vendor id driver options firmware);
+ $isdn = { map { $_ => $c->{$_} } qw(description vendor id driver card_type type) };
$isdn->{$_} = sprintf("%0x", $isdn->{$_}) foreach 'vendor', 'id';
$isdn->{card_type} = $c->{bus} eq 'USB' ? 'usb' : 'pci';
($isdn->{type}) = $isdn->{options} =~ /type=(\d+)/;