From: Daniel Mack <daniel@zonque.org>
Date: Thu, 11 Jun 2015 11:10:39 +0000 (+0200)
Subject: kmod-setup: don't print warning on -ENOSYS
X-Git-Tag: v221~113^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F166%2Fhead;p=thirdparty%2Fsystemd.git

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.
---

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);
         }