From e241a19ff5a11245250da10f17ce0ce539b70339 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 20 May 2003 22:07:33 +0000
Subject: (probe_category): one regexp is enough for isdn

---
 perl-install/modules.pm | 3 +--
 1 file changed, 1 insertion(+), 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;
-- 
cgit v1.2.1