diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-10-22 15:59:32 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-10-22 15:59:32 +0000 |
| commit | 12b36a5be288c96173918b72f2ad58afba177215 (patch) | |
| tree | 0222b00a72fb71e558fbc9f0f45dc9aa27b55ba0 | |
| parent | 95dd5e4e35d202aca602f5364211c4c4d0b8d81b (diff) | |
| download | drakx-12b36a5be288c96173918b72f2ad58afba177215.tar drakx-12b36a5be288c96173918b72f2ad58afba177215.tar.gz drakx-12b36a5be288c96173918b72f2ad58afba177215.tar.bz2 drakx-12b36a5be288c96173918b72f2ad58afba177215.tar.xz drakx-12b36a5be288c96173918b72f2ad58afba177215.zip | |
handle usb isdn adapters
| -rw-r--r-- | perl-install/network/isdn.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm index 4cb500634..5d966d8a6 100644 --- a/perl-install/network/isdn.pm +++ b/perl-install/network/isdn.pm @@ -187,11 +187,13 @@ sub isdn_ask { isdn_ask_step_1: my $e = $in->ask_from_list_(N("ISDN Configuration"), $label . "\n" . N("What kind of card do you have?"), - [ N_("ISA / PCMCIA"), N_("PCI"), N_("I don't know") ] + [ N_("ISA / PCMCIA"), N_("PCI"), N_("USB"), N_("I don't know") ] ) or return; isdn_ask_step_1b: if ($e =~ /PCI/) { $isdn->{card_type} = 'pci'; + } elsif ($e =~ /USB/) { + $isdn->{card_type} = 'usb'; } else { $in->ask_from_list_(N("ISDN Configuration"), N(" @@ -247,7 +249,7 @@ sub isdn_detect_backend { if (my ($c) = modules::probe_category('network/isdn')) { $isdn->{$_} = $c->{$_} foreach qw(description vendor id driver options firmware); $isdn->{$_} = sprintf("%0x", $isdn->{$_}) foreach 'vendor', 'id'; - $isdn->{card_type} = 'pci'; + $isdn->{card_type} = $c->{bus} eq 'USB' ? 'usb' : 'pci'; ($isdn->{type}) = $isdn->{options} =~ /type=(\d+)/; # $c->{options} !~ /id=HiSax/ && $isdn->{driver} eq "hisax" and $c->{options} .= " id=HiSax"; if ($c->{options} !~ /protocol=/ && $isdn->{protocol} =~ /\d/) { |