From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Tue, 7 Feb 2012 11:48:59 +0000 (-0200)
Subject: libkmod-module: probe: Fix ignore-loaded flag not being applied
X-Git-Tag: v6~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=269de2e0bf5011072da2f40f4f2d4023fad696b9;p=thirdparty%2Fkmod.git

libkmod-module: probe: Fix ignore-loaded flag not being applied
---

diff --git a/TODO b/TODO
index 23d7c764..6ab11f1f 100644
--- a/TODO
+++ b/TODO
@@ -38,6 +38,9 @@ Features:
 
 * Stop using system() inside the library and use fork + exec instead
 
+* Add tests for --show-depends: we need to first trap calls to
+  kmod_module_get_path(), because it's printed to stdout/stderr.
+
 Known Bugs:
 ===========
 
diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index 0af3e2ea..b5eb7c98 100644
--- a/libkmod/libkmod-module.c
+++ b/libkmod/libkmod-module.c
@@ -1132,7 +1132,8 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod,
 	if (mod == NULL)
 		return -ENOENT;
 
-	if (module_is_inkernel(mod)) {
+	if (!(flags & KMOD_PROBE_IGNORE_LOADED)
+					&& module_is_inkernel(mod)) {
 		if (flags & KMOD_PROBE_FAIL_ON_LOADED)
 			return -EEXIST;
 		else