diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/kmod-setup.c | 6 | ||||
| -rw-r--r-- | src/core/main.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index 0791ae8ead..2f3f608830 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -27,7 +27,7 @@ #include "macro.h" #include "execute.h" - +#include "capability.h" #include "kmod-setup.h" static void systemd_kmod_log( @@ -54,6 +54,7 @@ static bool cmdline_check_kdbus(void) { } int kmod_setup(void) { + static const struct { const char *module; const char *path; @@ -76,6 +77,9 @@ int kmod_setup(void) { unsigned int i; int r; + if (have_effective_cap(CAP_SYS_MODULE) == 0) + return 0; + for (i = 0; i < ELEMENTSOF(kmod_table); i++) { struct kmod_module *mod; diff --git a/src/core/main.c b/src/core/main.c index 4ad3bc2c57..899233bf51 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1589,8 +1589,7 @@ int main(int argc, char *argv[]) { status_welcome(); #ifdef HAVE_KMOD - if (detect_container(NULL) <= 0) - kmod_setup(); + kmod_setup(); #endif hostname_setup(); machine_id_setup(""); |