always use fast_mouse_probe (probing serial is now mostly deprecated, and it

is *re-done* by drakconnect, so no need to do it soon)

1 files changed, 2 insertions, 10 deletions

diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index ab1d1ac42..4f74fcccf 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -299,11 +299,8 @@ sub detect() {
 	log::l("no usb interface found for wacom");
     }
 
-    #- at this level, not all possible mice are detected so avoid invoking serial_probe
-    #- which takes a while for its probe.
-    if ($::isStandalone || $::move) {
-	my $mouse = $fast_mouse_probe->();
-	$mouse and return { wacom => \@wacom, %$mouse };
+    if (my $mouse = $fast_mouse_probe->()) {
+	return { wacom => \@wacom, %$mouse };
     }
 
     #- probe serial device to make sure a wacom has been detected.
@@ -311,11 +308,6 @@ sub detect() {
     my ($r, @serial_wacom) = mouseconfig(); push @wacom, @serial_wacom;
     $r and return { wacom => \@wacom, %$r };
 
-    if (!$::isStandalone && !$::move) {
-	my $mouse = $fast_mouse_probe->();
-	$mouse and return { wacom => \@wacom, %$mouse };
-    }
-
     #- in case only a wacom has been found, assume an inexistant mouse (necessary).
     @wacom and return fullname2mouse('none|No mouse', wacom => \@wacom);