summaryrefslogtreecommitdiff
path: root/src/modules-load/modules-load.c
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2012-06-27 21:44:49 +0200
committerMichal Schmidt <mschmidt@redhat.com>2012-06-27 21:54:24 +0200
commit27fda47f40453e552ebccf7acb85f915cf34f23a (patch)
tree1381272e563fc99195ff8cd3337e3e843e91bbc8 /src/modules-load/modules-load.c
parent75945badd29e4dfdf829198f0124175c676ce49a (diff)
modules-load: don't fail on builtin modules, better prints
Distinguish between non-existing modules, builtin modules, already loaded modules, and modules we load. Only the non-existing ones are treated as errors. https://bugzilla.redhat.com/show_bug.cgi?id=817760
Diffstat (limited to 'src/modules-load/modules-load.c')
-rw-r--r--src/modules-load/modules-load.c44
1 files changed, 31 insertions, 13 deletions
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 22ea7333ed..06e1a8cc84 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -117,7 +117,7 @@ finish:
}
static int load_module(struct kmod_ctx *ctx, const char *m) {
- const int probe_flags = KMOD_PROBE_APPLY_BLACKLIST|KMOD_PROBE_IGNORE_LOADED;
+ const int probe_flags = KMOD_PROBE_APPLY_BLACKLIST;
struct kmod_list *itr, *modlist = NULL;
int r = 0;
@@ -129,22 +129,40 @@ static int load_module(struct kmod_ctx *ctx, const char *m) {
return r;
}
+ if (!modlist) {
+ log_error("Failed to find module '%s'", m);
+ return r;
+ }
+
kmod_list_foreach(itr, modlist) {
struct kmod_module *mod;
- int err;
+ int state, err;
mod = kmod_module_get_module(itr);
- err = kmod_module_probe_insert_module(mod, probe_flags,
- NULL, NULL, NULL, NULL);
-
- if (err == 0)
- log_info("Inserted module '%s'", kmod_module_get_name(mod));
- else if (err == KMOD_PROBE_APPLY_BLACKLIST)
- log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
- else {
- log_error("Failed to insert '%s': %s", kmod_module_get_name(mod),
- strerror(-err));
- r = err;
+ state = kmod_module_get_initstate(mod);
+
+ switch (state) {
+ case KMOD_MODULE_BUILTIN:
+ log_info("Module '%s' is builtin", kmod_module_get_name(mod));
+ break;
+
+ case KMOD_MODULE_LIVE:
+ log_info("Module '%s' is already loaded", kmod_module_get_name(mod));
+ break;
+
+ default:
+ err = kmod_module_probe_insert_module(mod, probe_flags,
+ NULL, NULL, NULL, NULL);
+
+ if (err == 0)
+ log_info("Inserted module '%s'", kmod_module_get_name(mod));
+ else if (err == KMOD_PROBE_APPLY_BLACKLIST)
+ log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
+ else {
+ log_error("Failed to insert '%s': %s", kmod_module_get_name(mod),
+ strerror(-err));
+ r = err;
+ }
}
kmod_module_unref(mod);