summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-04-26 08:35:32 +0000
committerFrancois Pons <fpons@mandriva.com>2002-04-26 08:35:32 +0000
commit4a4f69dba9b824a8cbe5c9b6097328e8f41fc240 (patch)
tree7a588ed1aa23fa31f5aa1f29560ea4fa260bf3f0
parent9ef2c4468fb6b8ec0106a8ff66fcbd7b27c9236d (diff)
downloaddrakx-backup-do-not-use-4a4f69dba9b824a8cbe5c9b6097328e8f41fc240.tar
drakx-backup-do-not-use-4a4f69dba9b824a8cbe5c9b6097328e8f41fc240.tar.gz
drakx-backup-do-not-use-4a4f69dba9b824a8cbe5c9b6097328e8f41fc240.tar.bz2
drakx-backup-do-not-use-4a4f69dba9b824a8cbe5c9b6097328e8f41fc240.tar.xz
drakx-backup-do-not-use-4a4f69dba9b824a8cbe5c9b6097328e8f41fc240.zip
updated usbMice to take care of device declared as Mouse:USB in usbtable (was
not the case !)
-rw-r--r--perl-install/detect_devices.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index ada7297d6..b9b967adb 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -432,7 +432,8 @@ sub whatParport() {
@res;
}
-sub usbMice { grep { $_->{media_type} =~ /\|Mouse/ && $_->{driver} !~ /Tablet:wacom/} usb_probe() }
+sub usbMice { grep { ($_->{media_type} =~ /\|Mouse/ || $_->{driver} =~ /Mouse:USB/) &&
+ $_->{driver} !~ /Tablet:wacom/} usb_probe() };
sub usbWacom { grep { $_->{driver} =~ /Tablet:wacom/ } usb_probe() }
sub usbKeyboards { grep { $_->{media_type} =~ /\|Keyboard/ } usb_probe() }
sub usbStorage { grep { $_->{media_type} =~ /Mass Storage\|/ } usb_probe() }