From 401602eb9a8d365d64dc6c79fbe2aec2bd6f3654 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 17 Jun 2004 23:48:16 +0000
Subject: (pciusb_id) fix duplicated USB disks (in both disk and unknown
 categories)

---
 perl-install/harddrake/data.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'perl-install/harddrake')

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));
 }
 
 
-- 
cgit v1.2.1