summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-08-26 02:45:26 +0000
committerOlivier Blin <oblin@mandriva.org>2004-08-26 02:45:26 +0000
commitbca044d23e02fbe89a93aa8df9cf4916cd9e2eaf (patch)
tree364184ea52d47e54e1b83480404637b00e27160b
parent3fd5a86333bc1d358fe3de3db8b406c5bd2dce52 (diff)
downloaddrakx-backup-do-not-use-bca044d23e02fbe89a93aa8df9cf4916cd9e2eaf.tar
drakx-backup-do-not-use-bca044d23e02fbe89a93aa8df9cf4916cd9e2eaf.tar.gz
drakx-backup-do-not-use-bca044d23e02fbe89a93aa8df9cf4916cd9e2eaf.tar.bz2
drakx-backup-do-not-use-bca044d23e02fbe89a93aa8df9cf4916cd9e2eaf.tar.xz
drakx-backup-do-not-use-bca044d23e02fbe89a93aa8df9cf4916cd9e2eaf.zip
(detect) do not return unusable synaptics driver at beginning of install
-rw-r--r--perl-install/mouse.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 415600bec..956692057 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -292,6 +292,7 @@ sub detect {
my $synaptics_mouse;
if (my $mouse_nb = grep { /^H: Handlers=mouse/ } @input_devices) {
my $univ_mouse = fullname2mouse('Universal|Any PS/2 & USB mice', wacom => \@wacom);
+ $::isInstall && !$::o->{mouse} and return $univ_mouse; #- don't try to use synpatics at beginning of install
if (any { m!^N: Name="(?:SynPS/2 Synaptics TouchPad|AlpsPS/2 ALPS TouchPad)"$! } @input_devices) {
$synaptics_mouse = fullname2mouse('PS/2|Synaptics Touchpad');
$mouse_nb < 2 and return $synaptics_mouse;