summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mdk-stage1/NEWS2
-rw-r--r--mdk-stage1/modules.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index 843579e0a..1301cf4e5 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,5 @@
+- revert patch introduced in r7542
+
1.75
- fix loading modules with "-" in their names (mga#9242)
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index 3b4a94279..0c9aa0c32 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -92,13 +92,20 @@ static char *kernel_module_extension(void)
static char *filename2modname(char * filename) {
- char *modname;
+ char *modname, *p;
modname = strdup(basename(filename));
if (strstr(modname, kernel_module_extension())) {
modname[strlen(modname)-strlen(kernel_module_extension())] = '\0'; /* remove trailing .ko.gz */
}
+ p = modname;
+ while (p && *p) {
+ if (*p == '-')
+ *p = '_';
+ p++;
+ }
+
return modname;
}