diff options
| author | Olivier Blin <blino@mageia.org> | 2011-12-07 18:48:20 +0000 |
|---|---|---|
| committer | Olivier Blin <blino@mageia.org> | 2011-12-07 18:48:20 +0000 |
| commit | 3a84385d8cbe3503b4c5d1f003f1b45b39fc3194 (patch) | |
| tree | 36126bb90c415b13f30baeca72ffc08a9ea66e72 | |
| parent | 8738111177182ae0da1eb606c0d941c2eb114764 (diff) | |
| download | drakx-3a84385d8cbe3503b4c5d1f003f1b45b39fc3194.tar drakx-3a84385d8cbe3503b4c5d1f003f1b45b39fc3194.tar.gz drakx-3a84385d8cbe3503b4c5d1f003f1b45b39fc3194.tar.bz2 drakx-3a84385d8cbe3503b4c5d1f003f1b45b39fc3194.tar.xz drakx-3a84385d8cbe3503b4c5d1f003f1b45b39fc3194.zip | |
revert incorrect change in is_netbook_nettop(), the regexp was ok, fix perl_checker instead
| -rw-r--r-- | perl-install/detect_devices.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 5bf5bd366..b9eaa932a 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -1215,8 +1215,8 @@ sub is_vmware() { sub is_netbook_nettop() { my @cpus = getCPUs(); - (any { $_->{'model name'} =~ /(\bIntel\(R\) Atom\(TM\)\b)/i } @cpus) || - (any { $_->{'model name'} =~ /(\bIntel\(R\) Celeron\(R\) M processor\b|\bVIA C7-M Processor\b|\bGeode\(TM\)\b)/i && $_->{'cpu MHz'} < 1500 } @cpus); + (any { $_->{'model name'} =~ /(\bIntel\(R\) Atom\(TM\)\B)/i } @cpus) || + (any { $_->{'model name'} =~ /(\bIntel\(R\) Celeron\(R\) M processor\b|\bVIA C7-M Processor\b|\bGeode\(TM\)\B)/i && $_->{'cpu MHz'} < 1500 } @cpus); } sub has_low_resources() { |