AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2024-12-27 13:55:35 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only search path in moddep if it's not already set

Browse Source 
rmmod/insmod should be able to operate directly on files, not relying on
indexes and configuration.

The following test was not working and now it is:

$ # go to a dir != mod->dirname
$ cd /lib/modules/$(uname -r)/kernel
$ # try to insert module giving a relative path
$ insmod drivers/acpi/ac.ko
This commit is contained in:
Lucas De Marchi 2011-12-08 10:42:34 -02:00
parent 4eb2c0fca1
commit e005facdb9
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libkmod/libkmod-module.c
View File

@ -419,19 +419,22 @@ KMOD_EXPORT const char *kmod_module_get_name(const struct kmod_module *mod)
*/
KMOD_EXPORT const char *kmod_module_get_path(const struct kmod_module *mod)
{
if (!mod->init.dep) {
/* lazy init */
char *line = kmod_search_moddep(mod->ctx, mod->name);
char *line;
if (line == NULL)
return NULL;
DBG(mod->ctx, "name='%s' path='%s'", mod->name, mod->path);
kmod_module_parse_depline((struct kmod_module *) mod, line);
free(line);
if (mod->path != NULL)
return mod->path;
if (mod->init.dep)
return NULL;
if (!mod->init.dep)
return NULL;
}
/* lazy init */
line = kmod_search_moddep(mod->ctx, mod->name);
if (line == NULL)
return NULL;
kmod_module_parse_depline((struct kmod_module *) mod, line);
free(line);
return mod->path;
}