summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-06-17 23:48:16 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-06-17 23:48:16 +0000
commit401602eb9a8d365d64dc6c79fbe2aec2bd6f3654 (patch)
treef5945202bdc685f5fec11e259888dba708b989f7
parent4a1765bdc9774cddd79a1a61c41753b81228e17f (diff)
downloaddrakx-401602eb9a8d365d64dc6c79fbe2aec2bd6f3654.tar
drakx-401602eb9a8d365d64dc6c79fbe2aec2bd6f3654.tar.gz
drakx-401602eb9a8d365d64dc6c79fbe2aec2bd6f3654.tar.bz2
drakx-401602eb9a8d365d64dc6c79fbe2aec2bd6f3654.tar.xz
drakx-401602eb9a8d365d64dc6c79fbe2aec2bd6f3654.zip
(pciusb_id) fix duplicated USB disks (in both disk and unknown categories)
-rw-r--r--perl-install/harddrake/data.pm10
1 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 833c479b2..3f4d071bc 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -362,7 +362,15 @@ our @tree =
sub pciusb_id {
my ($dev) = @_;
- join(':', map { $dev->{$_} } qw(bus pci_bus pci_device vendor id subvendor subid description));
+ my %alt = (
+ bus => 'usb_bus',
+ description => 'usb_description',
+ id => 'usb_id',
+ pci_bus => 'usb_pci_bus',
+ pci_device => 'usb_pci_device',
+ vendor => 'usb_vendor',
+ );
+ join(':', map { $dev->{$alt{$_}} || $dev->{$_} } qw(bus pci_bus pci_device vendor id subvendor subid description));
}