summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-15 11:00:18 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-15 11:00:18 +0000
commit836837315047d3f2c616759dcaff181b4c476895 (patch)
tree7e92eb3c973b0c65fdd8bd946253568c4d879688
parent37efb0fb62d00d43cead6350a2b5329f02093804 (diff)
downloaddrakx-836837315047d3f2c616759dcaff181b4c476895.tar
drakx-836837315047d3f2c616759dcaff181b4c476895.tar.gz
drakx-836837315047d3f2c616759dcaff181b4c476895.tar.bz2
drakx-836837315047d3f2c616759dcaff181b4c476895.tar.xz
drakx-836837315047d3f2c616759dcaff181b4c476895.zip
(getBewan) use more permissive regexp for PCI modem, description in
pcitable may change
-rw-r--r--perl-install/detect_devices.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 9572215e5..a50c8a524 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -484,7 +484,7 @@ sub getSpeedtouch() {
}
sub getBewan() {
- matching_desc__regexp('Bewan Systems\|PCI ADSL Modem|BEWAN ADSL USB');
+ matching_desc__regexp('Bewan Systems\|.*ADSL|BEWAN ADSL USB');
}
sub getSagem() {
matching_driver(qw(adiusbadsl eagle-usb));
on, $configurator, $detector) = @$_;
+foreach my $hw_class (@harddrake::data::tree) {
+ my ($Ident, $title, $icon, $configurator, $detector) = @$hw_class{qw(class string icon configurator detector)};
next if ref($detector) ne "CODE"; #skip class witouth detector
# blacklist agp controllers b/c string is not yet translated:
next if $Ident eq 'AGP';
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 842fb60fd..20e43e995 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -38,8 +38,9 @@ my (%config, $wait);
my $in;
my $splash = -f '/proc/splash';
# For each hw, class, detect device, compare and offer to reconfigure if needed
-foreach (@harddrake::data::tree) {
- my ($Ident, $item, undef, $configurator, $detector, $do_it) = @$_;
+foreach my $hw_class (@harddrake::data::tree) {
+ my ($Ident, $item, $configurator, $detector, $do_it) = @$hw_class{qw(class string configurator detector checked_on_boot)};
+
next unless $do_it ^ $invert_do_it;
# No detector ? (should never happen but who know ?)
ref($detector) eq 'CODE' or next;