From 22854388195d27c2668250529e843a946e4d82ab Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 17 Jun 2004 23:48:37 +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 bafec358e..70ce2c5c8 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -367,7 +367,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