diff options
| author | Olivier Blin <oblin@mandriva.com> | 2010-02-23 17:51:16 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2010-02-23 17:51:16 +0000 |
| commit | e9560b7d4e99c90dfab33649706b36e3e47c0a00 (patch) | |
| tree | ce286d374af9f3f2f85d366155b1fb42322fe51e | |
| parent | f0b58677396b6abb04555f5ade619367807305d8 (diff) | |
| download | drakx-e9560b7d4e99c90dfab33649706b36e3e47c0a00.tar drakx-e9560b7d4e99c90dfab33649706b36e3e47c0a00.tar.gz drakx-e9560b7d4e99c90dfab33649706b36e3e47c0a00.tar.bz2 drakx-e9560b7d4e99c90dfab33649706b36e3e47c0a00.tar.xz drakx-e9560b7d4e99c90dfab33649706b36e3e47c0a00.zip | |
- detect_devices:
o fix merging PCI devices info from sysfs which resulted in
ill-informed devices matching (#57711)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 289c97e3d..c2e5316e4 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -3,6 +3,9 @@ - harddrake: o display info about cores o do not display 2 decades old CPU bugs +- detect_devices: + o fix merging PCI devices info from sysfs which resulted in + ill-informed devices matching (#57711) Version 13.11 - 10 February 2010 diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 8ed37c67e..a28c4fc49 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -707,7 +707,7 @@ sub get_ids_from_sysfs_device { my $usb_root = -f "$dev_path/bInterfaceNumber" && "../" || -f "$dev_path/idVendor" && ""; my $is_pcmcia = -f "$dev_path/card_id"; my $sysfs_ids; - my $bus = get_sysfs_field_from_link($dev_path, "bus"); + my $bus = get_sysfs_field_from_link($dev_path, "subsystem"); #- FIXME: use $bus if ($is_pcmcia) { $sysfs_ids = { modalias => $dev_cat->('modalias') }; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 2c199d62e..ff8c7d504 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,7 @@ +- detect_devices: + o fix merging PCI devices info from sysfs which resulted in + ill-informed devices matching (#57711) + Version 13.11 - 10 February 2010 - add support for asturian (#56990) |