diff options
| author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-01-31 12:05:36 -0200 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-01-31 14:08:57 -0200 |
| commit | 7aed46088e9351a68ede14e8b9037f16289ff270 (patch) | |
| tree | 6769d04887b30f2882b32e3d3be9540f57e822ac | |
| parent | 3bc92e8949146cb57e6eecfb954a6efe114a041a (diff) | |
| download | kmod-7aed46088e9351a68ede14e8b9037f16289ff270.tar.gz kmod-7aed46088e9351a68ede14e8b9037f16289ff270.zip | |
libkmod-module: probe: remove useless KMOD_PROBE_STOP_ON_COMMAND
| -rw-r--r-- | libkmod/libkmod-module.c | 17 | ||||
| -rw-r--r-- | libkmod/libkmod.h | 1 |
2 files changed, 4 insertions, 14 deletions
diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c index 948690a..a4878fa 100644 --- a/libkmod/libkmod-module.c +++ b/libkmod/libkmod-module.c @@ -1097,11 +1097,10 @@ static int kmod_module_get_probe_list(struct kmod_module *mod, * Insert a module in Linux kernel resolving dependencies, soft dependencies, * install commands and applying blacklist. * - * If @run_install is NULL, and the flag KMOD_PROBE_STOP_ON_COMMANDS is not - * given, this function will fork and exec by calling system(3). Don't pass a - * NULL argument in @run_install if your binary is setuid/setgid (see warning - * in system(3)). If you need control over the execution of an install - * command, give a callback function instead. + * If @run_install is NULL, this function will fork and exec by calling + * system(3). Don't pass a NULL argument in @run_install if your binary is + * setuid/setgid (see warning in system(3)). If you need control over the + * execution of an install command, give a callback function instead. * * Returns: 0 on success, > 0 if stopped by a reason given in @flags or < 0 on * failure. @@ -1160,14 +1159,6 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod, m == mod ? extra_options : NULL); if (cmd != NULL && !m->ignorecmd) { - if (flags & KMOD_PROBE_STOP_ON_COMMAND) { - DBG(mod->ctx, "Stopping on '%s': " - "install command\n", m->name); - err = KMOD_PROBE_STOP_ON_COMMAND; - free(options); - break; - } - if (print_action != NULL) print_action(m, true, options ?: ""); diff --git a/libkmod/libkmod.h b/libkmod/libkmod.h index a530a29..1d96d2a 100644 --- a/libkmod/libkmod.h +++ b/libkmod/libkmod.h @@ -135,7 +135,6 @@ enum kmod_probe { /* codes below can be used in return value, too */ KMOD_PROBE_APPLY_BLACKLIST_ALL = 0x10000, KMOD_PROBE_APPLY_BLACKLIST = 0x20000, - KMOD_PROBE_STOP_ON_COMMAND = 0x40000, }; /* |