diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-17 23:48:37 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-17 23:48:37 +0000 |
| commit | 22854388195d27c2668250529e843a946e4d82ab (patch) | |
| tree | 74852b6ec2c7a4cc5d1faa921057bce215520f47 /perl-install/harddrake | |
| parent | 79d407b82ed396b5496a4b31bbbf67c3153c2ce7 (diff) | |
| download | drakx-backup-do-not-use-22854388195d27c2668250529e843a946e4d82ab.tar drakx-backup-do-not-use-22854388195d27c2668250529e843a946e4d82ab.tar.gz drakx-backup-do-not-use-22854388195d27c2668250529e843a946e4d82ab.tar.bz2 drakx-backup-do-not-use-22854388195d27c2668250529e843a946e4d82ab.tar.xz drakx-backup-do-not-use-22854388195d27c2668250529e843a946e4d82ab.zip | |
(pciusb_id) fix duplicated USB disks (in both disk and unknown categories)
Diffstat (limited to 'perl-install/harddrake')
| -rw-r--r-- | perl-install/harddrake/data.pm | 10 |
1 files changed, 9 insertions, 1 deletions
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)); } |