summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-09 06:00:24 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-09 06:00:24 +0000
commit78386db640777f6cc85ca8616e6d4b015725d6df (patch)
treec3cf3ae2a187846b4f93ce8c1588a6d0ab7a201a
parent8c19f25700b78c120b416adc556f67cd6280354a (diff)
downloaddrakx-78386db640777f6cc85ca8616e6d4b015725d6df.tar
drakx-78386db640777f6cc85ca8616e6d4b015725d6df.tar.gz
drakx-78386db640777f6cc85ca8616e6d4b015725d6df.tar.bz2
drakx-78386db640777f6cc85ca8616e6d4b015725d6df.tar.xz
drakx-78386db640777f6cc85ca8616e6d4b015725d6df.zip
fix detecting some USB devices due to not reporting their class (mga#9674)
regression introduced in commit r7096 on 2013-01-14: "use a proper interface between C (ldetect) & perl world, using XS"
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/c/stuff.xs.pl1
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c0a79a908..a0a8bbbd8 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- library:
+ o fix detecting some USB devices due to not reporting their class (mga#9674)
- finish-install:
o configure urpmi media even if local media are configured, and only if
online media are not setup (for live)
diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl
index 42dc7841d..de4800529 100755
--- a/perl-install/c/stuff.xs.pl
+++ b/perl-install/c/stuff.xs.pl
@@ -305,6 +305,7 @@ usb_probe()
snprintf(buf, sizeof(buf), "%s|%s|%s", class_text.usb_class_text, class_text.usb_sub_text, class_text.usb_prot_text);
HV * rh = common_pciusb_hash_init(e);
hv_store(rh, "usb_port", 8, newSVnv(e->usb_port), 0);
+ hv_store(rh, "media_type", 10, newSVpv(buf, 0), 0);
PUSHs(newRV((SV *)rh));
}
pciusb_free(&entries);
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 65f540b97..29a8d9008 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- library:
+ o fix detecting some USB devices due to not reporting their class (mga#9674)
- partitionning:
o allow to choose btrfs in normal mode (mga#65)