summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-09 05:46:16 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-09 05:46:16 +0000
commit8c19f25700b78c120b416adc556f67cd6280354a (patch)
tree0c48ad717fdbc7b1886be15f1ecc44ffb7497261
parentf9242e175a5e78a67416434113c2fe39c0abaa02 (diff)
downloaddrakx-8c19f25700b78c120b416adc556f67cd6280354a.tar
drakx-8c19f25700b78c120b416adc556f67cd6280354a.tar.gz
drakx-8c19f25700b78c120b416adc556f67cd6280354a.tar.bz2
drakx-8c19f25700b78c120b416adc556f67cd6280354a.tar.xz
drakx-8c19f25700b78c120b416adc556f67cd6280354a.zip
fix displayed PCI/USB ids (spot in mga#9674)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/detect_devices.pm2
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;