summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-05 05:32:39 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-05 05:32:39 +0000
commit16b5a3af1260ee3e5b1b03c440aa598d5b05a874 (patch)
tree2ed43997c2edbbdc7e8c5685af14e5aec3ac28a2
parentc1b083bcdb5508e9f499ab054c8c354303de2212 (diff)
downloaddrakx-backup-do-not-use-16b5a3af1260ee3e5b1b03c440aa598d5b05a874.tar
drakx-backup-do-not-use-16b5a3af1260ee3e5b1b03c440aa598d5b05a874.tar.gz
drakx-backup-do-not-use-16b5a3af1260ee3e5b1b03c440aa598d5b05a874.tar.bz2
drakx-backup-do-not-use-16b5a3af1260ee3e5b1b03c440aa598d5b05a874.tar.xz
drakx-backup-do-not-use-16b5a3af1260ee3e5b1b03c440aa598d5b05a874.zip
isLaptop() special code for ppc
-rw-r--r--perl-install/detect_devices.pm13
1 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 541c0762f..30ba97147 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -733,11 +733,14 @@ sub hasPCMCIA() { $::o->{pcmcia} } #- because /proc/pcmcia seems not to be prese
#- try to detect a laptop, we assume pcmcia service is an indication of a laptop or
#- the following regexp to match graphics card apparently only used for such systems.
sub isLaptop() {
- hasPCMCIA() || (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)'))
- || cat_('/proc/cpuinfo') =~ /\bmobile\b/i;
+ arch() =~ /ppc/ ?
+ get_mac_model() =~ /Book/ :
+ hasPCMCIA()
+ || (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)'))
+ || cat_('/proc/cpuinfo') =~ /\bmobile\b/i;
}
sub usbMice() { grep { $_->{media_type} =~ /\|Mouse/ && $_->{driver} !~ /Tablet:wacom/ ||