From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 8 Oct 2017 14:21:06 +0000 (+0200)
Subject: modules-load: downgrade error on ENODEV/ENOENT
X-Git-Tag: v236~345^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7034%2Fhead;p=thirdparty%2Fsystemd.git

modules-load: downgrade error on ENODEV/ENOENT

Some kernel modules may be loaded if the hardware does not exist
(usually when the hardware is hot-pluggable), while others fail with
ENODEV. Let's make those two cases more similar, and simply log
modules which cannot be loaded because of missing hardware without
failing systemd-modules-load.service.

For modules which don't exist, let's warn, but not fail the whole
service. I think a warning is appropriate because it's likely that
a typo was made.
---

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index c1a89cf822a..aaf29271132 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -119,8 +119,15 @@ static int load_module(struct kmod_ctx *ctx, const char *m) {
                                 log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
                         else {
                                 assert(err < 0);
-                                r = log_error_errno(err, "Failed to insert '%s': %m",
-                                                    kmod_module_get_name(mod));
+
+                                log_full_errno(err == ENODEV ? LOG_NOTICE :
+                                               err == ENOENT ? LOG_WARNING :
+                                                               LOG_ERR,
+                                               err,
+                                               "Failed to insert '%s': %m",
+                                               kmod_module_get_name(mod));
+                                if (!IN_SET(err, ENODEV, ENOENT))
+                                        r = err;
                         }
                 }
         }