summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-05-20 22:07:33 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-05-20 22:07:33 +0000
commite241a19ff5a11245250da10f17ce0ce539b70339 (patch)
tree8b554b98e1f30a94dc18eca0048b6b4135d7713b
parent563854d62a943720234d37db84208ea9c68f9ac1 (diff)
downloaddrakx-e241a19ff5a11245250da10f17ce0ce539b70339.tar
drakx-e241a19ff5a11245250da10f17ce0ce539b70339.tar.gz
drakx-e241a19ff5a11245250da10f17ce0ce539b70339.tar.bz2
drakx-e241a19ff5a11245250da10f17ce0ce539b70339.tar.xz
drakx-e241a19ff5a11245250da10f17ce0ce539b70339.zip
(probe_category): one regexp is enough for isdn
-rw-r--r--perl-install/modules.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 9ccd94fb1..e985ad531 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -115,12 +115,11 @@ sub probe_category {
grep {
if ($category eq 'network/isdn') {
- my $b = $_->{driver} =~ /ISDN:([^,]*),?([^,]*),?(.*)/;
+ my $b = $_->{driver} =~ /ISDN:([^,]*),?([^,]*)(?:,firmware=(.*))?/;
if ($b) {
$_->{driver} = $1;
$_->{options} = $2;
$_->{firmware} = $3;
- $_->{firmware} =~ s/firmware=//;
$_->{driver} eq "hisax" and $_->{options} .= " id=HiSax";
}
$b;