diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-04-09 05:46:16 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-04-09 05:46:16 +0000 |
| commit | 444fd1835018fe00fc9a01cfecfd150e175e2106 (patch) | |
| tree | 0c48ad717fdbc7b1886be15f1ecc44ffb7497261 | |
| parent | 3714f1541b36f78127bc506f5cef9eb96e2fc11e (diff) | |
| download | drakx-backup-do-not-use-444fd1835018fe00fc9a01cfecfd150e175e2106.tar drakx-backup-do-not-use-444fd1835018fe00fc9a01cfecfd150e175e2106.tar.gz drakx-backup-do-not-use-444fd1835018fe00fc9a01cfecfd150e175e2106.tar.bz2 drakx-backup-do-not-use-444fd1835018fe00fc9a01cfecfd150e175e2106.tar.xz drakx-backup-do-not-use-444fd1835018fe00fc9a01cfecfd150e175e2106.zip | |
fix displayed PCI/USB ids (spot in mga#9674)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index e8bddc0ea..c0a79a908 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -3,6 +3,8 @@ online media are not setup (for live) - diskdrake: o allow to choose btrfs in normal mode (mga#65) +- harddrake: + o fix displayed PCI/USB ids (spot in mga#9674) Version 15.36 - 6 April 2013 diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 6617fcd59..08d344fac 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -847,7 +847,6 @@ my (@pci, @usb); sub pci_probe__real() { add_addons($pcitable_addons, map { my $l = $_; - $l->{$_} = hex $l->{$_} foreach qw(vendor id subvendor subid); $l->{bus} = 'PCI'; $l->{sysfs_device} = '/sys/bus/pci/devices/' . get_pci_sysfs_path($l); $l; @@ -870,7 +869,6 @@ sub usb_probe__real() { add_addons($usbtable_addons, map { my $l = $_; $l->{media_type} = join('|', grep { $_ ne '(null)' } split('\|', $l->{media_type})); - $l->{$_} = hex $l->{$_} foreach qw(vendor id); $l->{sysfs_device} = "/sys/bus/usb/devices/$l->{pci_bus}-" . ($l->{usb_port} + 1); $l->{bus} = 'USB'; $l; |