diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2015-07-01 12:54:58 +0200 |
---|---|---|
committer | David Herrmann <dh.herrmann@gmail.com> | 2015-07-01 12:58:03 +0200 |
commit | e04658277d531763a5cbbb6e212041a35e0d9ff4 (patch) | |
tree | ec3175f2b72180a7e7cd9a2048bf616770aeaf82 /src/core/kmod-setup.c | |
parent | sysv-generator test: Fix random ordering failure (diff) | |
download | systemd-e04658277d531763a5cbbb6e212041a35e0d9ff4.tar.xz systemd-e04658277d531763a5cbbb6e212041a35e0d9ff4.zip |
Revert "kmod-setup: don't print warning on -ENOSYS"
This partially reverts commit 78d298bbc57e412574ea35e6e66f562d97fd9ebc.
The changed coding-style is kept, but the ENOENT->ENOSYS conversion is
reverted.
kmod was fixed upstream to no longer return ENOSYS. Also see:
https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=114ec87c85c35a2bd3682f9f891e494127be6fb5
The kmod fix is marked for backport, so no reason to bump the kmod
version we depend on.
Diffstat (limited to 'src/core/kmod-setup.c')
-rw-r--r-- | src/core/kmod-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index e7a6bdc8c4..fc6d2f4acb 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -116,7 +116,7 @@ int kmod_setup(void) { else if (r == KMOD_PROBE_APPLY_BLACKLIST) log_info("Module '%s' is blacklisted", kmod_module_get_name(mod)); else { - bool print_warning = kmod_table[i].warn_if_unavailable || (r < 0 && r != -ENOSYS); + bool print_warning = kmod_table[i].warn_if_unavailable || (r < 0 && r != -ENOENT); log_full_errno(print_warning ? LOG_WARNING : LOG_DEBUG, r, "Failed to insert module '%s': %m", kmod_module_get_name(mod)); |