summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mdk-stage1/NEWS2
-rw-r--r--mdk-stage1/probe-modules.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index d41929ea4..28d7c69f3 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,5 @@
+- allow to pass module options to probe-modules
+
1.28:
- fix segfault with empty device description (can happen for USB devices)
diff --git a/mdk-stage1/probe-modules.c b/mdk-stage1/probe-modules.c
index 302f13864..6f162aed4 100644
--- a/mdk-stage1/probe-modules.c
+++ b/mdk-stage1/probe-modules.c
@@ -40,12 +40,18 @@ int main(int argc, char **argv, char **env)
{
enum media_bus bus = BUS_ANY;
char *module = NULL;
+ char options[500] = "";
if (argc > 1) {
if (streq(argv[1], "--usb")) {
bus = BUS_USB;
} else if (!ptr_begins_static_str(argv[1], "--")) {
+ int i;
module = argv[1];
+ for (i = 2; i < argc; i++) {
+ strcat(options, argv[i]);
+ strcat(options, " ");
+ }
}
}
@@ -53,7 +59,7 @@ int main(int argc, char **argv, char **env)
init_modules_insmoding();
if (module) {
- my_insmod(module, ANY_DRIVER_TYPE, NULL, 0);
+ my_insmod(module, ANY_DRIVER_TYPE, options, 0);
} else {
find_media(bus);
}
mn1'>| * Update Czech translation from TxYuri Chornoivan2016-02-011-52/+61 | * Update German translation from TxYuri Chornoivan2016-01-301-1/+3 | * Update Brazilian Portuguese translation from TxYuri Chornoivan2016-01-301-44/+50 | * Update Catalan translation from TxYuri Chornoivan2016-01-261-91/+171 | * Update German translation from TxYuri Chornoivan2016-01-241-1/+4 | * Update Italian translation from TxYuri Chornoivan2016-01-221-36/+37 | * Update Lithuanian translation from TxYuri Chornoivan2016-01-221-14/+26 | * Update German translation from TxYuri Chornoivan2016-01-221-2/+11 | * Update Slovak translation from TxYuri Chornoivan2016-01-141-64/+81 | * Update German translation from TxYuri Chornoivan2016-01-141-17/+57 | * Update Brazilian Portuguese translation from TxYuri Chornoivan2016-01-141-165/+118 | * Update German translation from TxYuri Chornoivan2016-01-141-6/+6 | * Update Slovak translation from TxYuri Chornoivan2016-01-141-1/+1 | * Update Slovak translation from TxYuri Chornoivan2016-01-121-7/+10 | * Update Swedish translation from TxYuri Chornoivan2016-01-121-19/+27 | * Update Ukrainian translationYuri Chornoivan2016-01-121-3/+3 | * updated stringsAngelo Naselli2016-01-1150-133053/+133255 | * Update German translation from TxYuri Chornoivan2016-01-111-11/+30 | * Update Basque translation from TxYuri Chornoivan2016-01-091-92/+61 | * Update French translation from TxYuri Chornoivan2016-01-091-99/+63 | * Update Czech translation from TxYuri Chornoivan2016-01-091-79/+45 | * Update Slovak translation from TxYuri Chornoivan2016-01-091-127/+61 | * Update Welsh translation from TxYuri Chornoivan2016-01-091-124/+142 | * Update Spanish translation from TxYuri Chornoivan2016-01-091-147/+107 | * Update Welsh translation from TxYuri Chornoivan2016-01-071-107/+128 | * Update German translation from TxYuri Chornoivan2016-01-071-81/+120 | * Update Swedish translation from TxYuri Chornoivan2016-01-071-146/+106 | * Update Ukrainian translationYuri Chornoivan2016-01-061-55/+37 | * Fix minor typoYuri Chornoivan2016-01-061-1/+1 | * Updated for desktop filesAngelo Naselli2016-01-0650-60/+7416 | * Update Ukrainian translationYuri Chornoivan2016-01-061-30/+42 | * use pt_PT translation from TX if fuzzy or untranslatedfilip2016-01-061-290/+302 | * Updated for forgotten policy filesAngelo Naselli2016-01-06