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

diff --git a/TODO b/TODO
index 23d7c764cf29997390b29b464ae019cd111e7061..6ab11f1f2ebc4dc8214b38527f32d20d88c080d3 100644 (file)
--- 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 0af3e2ea9175eae71d543d4b47246badeba7444f..b5eb7c98deea323dc384e7b47c574897cacf9f01 100644 (file)
--- 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