From 78d298bbc57e412574ea35e6e66f562d97fd9ebc Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Thu, 11 Jun 2015 13:10:39 +0200 Subject: [PATCH] kmod-setup: don't print warning on -ENOSYS -ENOSYS is returned from kmod_module_probe_insert_module() if a module isn't available, not -ENOENT. Don't spit out a warning in that case unless the warn_if_unavailable flag is set. Also factor out the condition into an own variable for better readability. --- src/core/kmod-setup.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index d956f9b190b..f5584b6b14f 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -117,10 +117,12 @@ int kmod_setup(void) { log_info("Inserted module '%s'", kmod_module_get_name(mod)); else if (r == KMOD_PROBE_APPLY_BLACKLIST) log_info("Module '%s' is blacklisted", kmod_module_get_name(mod)); - else - log_full_errno((kmod_table[i].warn_if_unavailable || (r < 0 && r != -ENOENT)) ? LOG_WARNING : LOG_DEBUG, - r, + else { + bool print_warning = kmod_table[i].warn_if_unavailable || (r < 0 && r != -ENOSYS); + + log_full_errno(print_warning ? LOG_WARNING : LOG_DEBUG, r, "Failed to insert module '%s': %m", kmod_module_get_name(mod)); + } kmod_module_unref(mod); }