diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-08-27 08:09:57 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-08-27 08:09:57 +0000 |
| commit | 6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab (patch) | |
| tree | 23df90df1d2b45befe8d62f5f452399d2a79f394 /perl-install/detect_devices.pm | |
| parent | 2e7bec9cf05c2ad1d747260087aab55f00656915 (diff) | |
| download | drakx-backup-do-not-use-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.tar drakx-backup-do-not-use-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.tar.gz drakx-backup-do-not-use-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.tar.bz2 drakx-backup-do-not-use-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.tar.xz drakx-backup-do-not-use-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.zip | |
add __regexp suffix to matching_desc() and matching_driver()
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 05b4536a8..b9416d084 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -463,7 +463,7 @@ sub getSerialModem { sub getModem { my ($modules_conf) = @_; - getSerialModem($modules_conf, {}), matching_driver('www\.linmodems\.org'), + getSerialModem($modules_conf, {}), matching_driver__regexp('www\.linmodems\.org'), grep { member($_->{driver}, qw(snd-atiixp-modem snd-intel8x0m)) } probeall(); } @@ -685,11 +685,11 @@ sub probeall() { require sbus_probing::main; pci_probe(), usb_probe(), firewire_probe(), pcmcia_probe(), sbus_probing::main::probe(); } -sub matching_desc { +sub matching_desc__regexp { my ($regexp) = @_; grep { $_->{description} =~ /$regexp/i } probeall(); } -sub matching_driver { +sub matching_driver__regexp { my ($regexp) = @_; grep { $_->{driver} =~ /$regexp/i } probeall(); } @@ -777,10 +777,10 @@ sub isLaptop() { arch() =~ /ppc/ ? get_mac_model() =~ /Book/ : dmidecode()->{isLaptop} - || (matching_desc('C&T.*655[45]\d') || matching_desc('C&T.*68554') || - matching_desc('Neomagic.*Magic(Media|Graph)') || - matching_desc('ViRGE.MX') || matching_desc('S3.*Savage.*[IM]X') || - matching_desc('ATI.*(Mobility|LT)')) + || (matching_desc__regexp('C&T.*655[45]\d') || matching_desc__regexp('C&T.*68554') || + matching_desc__regexp('Neomagic.*Magic(Media|Graph)') || + matching_desc__regexp('ViRGE.MX') || matching_desc__regexp('S3.*Savage.*[IM]X') || + matching_desc__regexp('ATI.*(Mobility|LT)')) || cat_('/proc/cpuinfo') =~ /\bmobile\b/i; } |