diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-11-29 16:56:51 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-11-29 16:56:51 +0000 |
| commit | b8d65538089da9c7b2022448569fcd918d5a5799 (patch) | |
| tree | 9c4f88eb2e31049488822c47d18cd29c2e4761e0 | |
| parent | 11975a292dc097e3ae4bcd06f0780a9dbb91f0d8 (diff) | |
| download | drakx-backup-do-not-use-b8d65538089da9c7b2022448569fcd918d5a5799.tar drakx-backup-do-not-use-b8d65538089da9c7b2022448569fcd918d5a5799.tar.gz drakx-backup-do-not-use-b8d65538089da9c7b2022448569fcd918d5a5799.tar.bz2 drakx-backup-do-not-use-b8d65538089da9c7b2022448569fcd918d5a5799.tar.xz drakx-backup-do-not-use-b8d65538089da9c7b2022448569fcd918d5a5799.zip | |
(isLaptop) fix wrongly detecting some devices as laptop specific due
to too hungry regexp (#35759)
| -rw-r--r-- | perl-install/detect_devices.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index acfaab9c7..8f2de29de 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -1045,7 +1045,7 @@ sub isLaptop() { matching_desc__regexp('Neomagic.*Magic(Media|Graph)') || matching_desc__regexp('ViRGE.MX') || matching_desc__regexp('S3.*Savage.*[IM]X') || matching_desc__regexp('Intel Corporation\|Mobile') || - matching_desc__regexp('ATI.*(Mobility|LT)')) + matching_desc__regexp('\bATI\b.*(Mobility|\bLT\b)')) || cat_('/proc/cpuinfo') =~ /\bmobile\b/i || probe_unique_name("Type") eq 'laptop' #- ipw2100/2200/3945 are Mini-PCI (Express) adapters diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index fa61be29b..653796bcc 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -5,6 +5,7 @@ calling it again (#35255) (ie implement "lilo -u" for grub) - ensure /etc/sysconfig/console/default.kmap is generated with installed keymaps, not installer simplified (?) .bkmap (#35376) +- fix wrongly detecting some devices as laptop specific (#35759) - add /etc/mke2fs.conf symlink so that mke2fs can use it (cf #27377) Version 10.5.5 - 14 November 2007, by Pascal "Pixel" Rigaux |