summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2010-02-23 17:51:16 +0000
committerOlivier Blin <oblin@mandriva.com>2010-02-23 17:51:16 +0000
commitddbcbe6dd613d2933f6c4be78d00efe55184fb5b (patch)
tree18db27fce7230bcd28c8edab216b8416224fa25e
parent56d3e3c71940c6f9dc1aeb51dfdeba912f5477f8 (diff)
downloaddrakx-backup-do-not-use-ddbcbe6dd613d2933f6c4be78d00efe55184fb5b.tar
drakx-backup-do-not-use-ddbcbe6dd613d2933f6c4be78d00efe55184fb5b.tar.gz
drakx-backup-do-not-use-ddbcbe6dd613d2933f6c4be78d00efe55184fb5b.tar.bz2
drakx-backup-do-not-use-ddbcbe6dd613d2933f6c4be78d00efe55184fb5b.tar.xz
drakx-backup-do-not-use-ddbcbe6dd613d2933f6c4be78d00efe55184fb5b.zip
- detect_devices:distro/mdv2010.0
o fix merging PCI devices info from sysfs which resulted in ill-informed devices matching (#57711)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/detect_devices.pm2
-rw-r--r--perl-install/install/NEWS3
3 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 3abbd1e64..ed1018f2a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,7 @@
- list rt3090sta module in network/wireless
+- detect_devices:
+ o fix merging PCI devices info from sysfs which resulted in
+ ill-informed devices matching (#57711)
Version 12.77.6 - 11 February 2010
- run_program:
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 74c860f02..814499d9a 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -691,7 +691,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 320d5a3e1..5dd069d5a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,7 @@
- list rt3090sta module in network/wireless
+- detect_devices:
+ o fix merging PCI devices info from sysfs which resulted in
+ ill-informed devices matching (#57711)
Version 12.77.5 - 09 February 2010