diff options
| author | Maarten Vanraes <alien@mageia.org> | 2013-03-20 19:59:02 +0000 |
|---|---|---|
| committer | Maarten Vanraes <alien@mageia.org> | 2013-03-20 19:59:02 +0000 |
| commit | 5eeb7602d91b2ef48b0ac041d1a1e3150735f182 (patch) | |
| tree | de9b90b5fc3a29441308bce61f7319b5ee15bc96 | |
| parent | 7e87f7949a82c5bc19a6be5d6eff054bfbdff866 (diff) | |
| download | drakx-5eeb7602d91b2ef48b0ac041d1a1e3150735f182.tar drakx-5eeb7602d91b2ef48b0ac041d1a1e3150735f182.tar.gz drakx-5eeb7602d91b2ef48b0ac041d1a1e3150735f182.tar.bz2 drakx-5eeb7602d91b2ef48b0ac041d1a1e3150735f182.tar.xz drakx-5eeb7602d91b2ef48b0ac041d1a1e3150735f182.zip | |
revert patch introduced in r7542
| -rw-r--r-- | mdk-stage1/NEWS | 2 | ||||
| -rw-r--r-- | mdk-stage1/modules.c | 9 |
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; } |