From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Tue, 31 Jan 2012 14:05:36 +0000 (-0200)
Subject: libkmod-module: probe: remove useless KMOD_PROBE_STOP_ON_COMMAND
X-Git-Tag: v5~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aed46088e9351a68ede14e8b9037f16289ff270;p=thirdparty%2Fkmod.git

libkmod-module: probe: remove useless KMOD_PROBE_STOP_ON_COMMAND
---

diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index 948690a6..a4878fad 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 a530a297..1d96d2a9 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,
 };
 
 /*