mirror of
https://github.com/systemd/systemd
synced 2024-10-15 12:34:37 +00:00
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.
This commit is contained in:
parent
2c3f0bb207
commit
6cbb0af16e
|
@ -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",
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue