AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2024-11-23 23:10:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

libkmod-module: probe: add print_action callback

Browse Source 
This allows to implement dry-run in modprobe without exporting
kmod_module_get_probe_list().
This commit is contained in:
Lucas De Marchi 2012-01-30 17:02:06 -02:00
parent d851e9a144
commit 6bd0713deb
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libkmod/libkmod-module.c
View File

@ -1090,6 +1090,9 @@ static int kmod_module_get_probe_list(struct kmod_module *mod,
* to @mod, not to its dependencies.
* @run_install: function to run when @mod is backed by an install command.
* @data: data to give back to @run_install callback
* @print_action: function to call with the action being taken (install or
* insmod). It's useful for tools like modprobe when running with verbose
* output or in dry-run mode.
*
* Insert a module in Linux kernel resolving dependencies, soft dependencies,
* install commands and applying blacklist.
@ -1107,7 +1110,10 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod,
unsigned int flags, const char *extra_options,
int (*run_install)(struct kmod_module *m,
const char *cmd, void *data),
const void *data)
const void *data,
void (*print_action)(struct kmod_module *m,
bool install,
const char *options))
{
struct kmod_list *list = NULL, *l;
struct probe_insert_cb cb;
@ -1161,6 +1167,9 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod,
free(options);
break;
}
if (print_action != NULL)
print_action(m, true, options ?: "");
err = module_do_install_commands(m, options, &cb);
} else {
int state = kmod_module_get_initstate(m);
@ -1178,6 +1187,9 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod,
free(options);
continue;
}
if (print_action != NULL)
print_action(m, false, options ?: "");
err = kmod_module_insert_module(m, flags, options);
}

3
libkmod/libkmod.h
View File

@ -163,7 +163,8 @@ int kmod_module_insert_module(struct kmod_module *mod, unsigned int flags, const
int kmod_module_probe_insert_module(struct kmod_module *mod,
unsigned int flags, const char *extra_options,
int (*run_install)(struct kmod_module *m, const char *cmdline, void *data),
const void *data);
const void *data,
void (*print_action)(struct kmod_module *m, bool install, const char *options));
const char *kmod_module_get_name(const struct kmod_module *mod);
const char *kmod_module_get_path(const struct kmod_module *mod);