From a35e12be737182be8511d0205adbff8023b818ee Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 6 Sep 2002 16:27:49 +0000 Subject: during install, don't probe PS/2 mice when a serial mouse is already found. (otherwise if a PS/2 keyboard is present, a PS/2 is found even if absent, and configuring an auxmouse PS/2 causes the PS/2 keyboard to freeze) (thanks to Nora Etukudo) --- perl-install/mouse.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'perl-install/mouse.pm') diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 48aa6fc51..106e8c3cd 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -312,14 +312,11 @@ sub detect() { #- probe serial device to make sure a wacom has been detected. eval { modules::load("serial") }; my ($r, @serial_wacom) = mouseconfig(); push @wacom, @serial_wacom; + $r and return { wacom => \@wacom, %$r }; if (!$::isStandalone) { my $mouse = $fast_mouse_probe->(); - $r && $mouse and $r->{auxmouse} = $mouse; #- we kept the auxilliary mouse as PS/2. - $r and return { wacom => \@wacom, %$r }; $mouse and return { wacom => \@wacom, %$mouse }; - } else { - $r and return { wacom => \@wacom, %$r }; } #- in case only a wacom has been found, assume an inexistant mouse (necessary). -- cgit v1.2.1