From 7c4bc2258abb36a3295fcc2cce910544b705d2e1 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Fri, 6 Sep 2002 17:13:18 +0000
Subject: - don't list usb mouses as unknown hw - fix mouse detection
 (mouse::detect() needed   modules::mergein_conf('/etc/modules.conf') first -
 don't skip mouse in --test mode

---
 perl-install/harddrake/data.pm | 7 +++++--
 perl-install/harddrake/ui.pm   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index ac912794a..d88925014 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -12,7 +12,7 @@ my @devices = detect_devices::probeall(1);
 
 # Update me each time you handle one more devices class (aka configurator)
 sub unknown {
-    grep { ($_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|Printer|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|STORAGE_(IDE|SCSI|OTHER)|BRIDGE|NETWORK/) && ($_->{driver} ne 'scanner') && $_->{type} ne 'network'} @devices;
+    grep { ($_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|Printer|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|STORAGE_(IDE|SCSI|OTHER)|BRIDGE|NETWORK/) && ($_->{driver} ne 'scanner') && $_->{type} ne 'network' && $_->{driver} !~ /Mouse:USB|/} @devices;
 }
 
 
@@ -69,7 +69,10 @@ our @tree =
 	 sub { 
 		require scanner; scanner::detect() }, 0 ],
 	["MOUSE","Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { 
-	    require mouse; &mouse::detect() } , 1 ],
+	    require mouse;
+	    require modules;
+	    modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf';
+	    &mouse::detect() } , 1 ],
 	["JOYSTICK","Joystick", "joystick.png", "", sub {}, 0 ],
 
 	["ATA_STORAGE","(E)IDE/ATA controllers", "ide_hd.png", "", sub { grep { $_->{media_type} =~ 'STORAGE_(IDE|OTHER)' } @devices}, 0 ],
diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm
index 15a897daa..49b48caaf 100644
--- a/perl-install/harddrake/ui.pm
+++ b/perl-install/harddrake/ui.pm
@@ -176,7 +176,7 @@ sub new {
 	   my ($Ident, $title, $icon, $configurator, $detector) = @$_;
 	   next if (ref($detector) ne "CODE"); #skip class witouth detector
 	   print _("Probing %s class\n", $Ident);
-	   next if $Ident =~ /(MODEM|PRINTER|MOUSE)/ && "@ARGV" =~ /test/;
+	   next if $Ident =~ /(MODEM|PRINTER)/ && "@ARGV" =~ /test/;
 	   my @devices = &$detector;
 	   next if (!listlength(@devices)); # Skip empty class (no devices)
 	   my $hw_class_tree = $tree->insert_node(undef, undef, [$title], 5, (gtkcreate_png($icon)) x 2, 0, ($title =~ /Unknown/ ? 0 : 1));
-- 
cgit v1.2.1