summaryrefslogtreecommitdiff
path: root/src/core/main.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-11-14 17:58:32 +0100
committerLennart Poettering <lennart@poettering.net>2014-11-14 17:58:32 +0100
commitf84f9974d827314c8ee86f65a5007ccee210422b (patch)
tree0d2683390b168962cd1c071d4f9c33aba55fc5c7 /src/core/main.c
parent264b8070715d2d19344c4991ace21147d998f56d (diff)
kmod: move #ifdef checks for kmod-setup out of main.c into kmod-setup.c
Diffstat (limited to 'src/core/main.c')
-rw-r--r--src/core/main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/main.c b/src/core/main.c
index 59a2be97f3..64acdf76e1 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -75,9 +75,7 @@
#include "selinux-setup.h"
#include "ima-setup.h"
#include "smack-setup.h"
-#ifdef HAVE_KMOD
#include "kmod-setup.h"
-#endif
static enum {
ACTION_RUN,
@@ -1389,10 +1387,10 @@ int main(int argc, char *argv[]) {
/* Mount /proc, /sys and friends, so that /proc/cmdline and
* /proc/$PID/fd is available. */
if (getpid() == 1) {
-#ifdef HAVE_KMOD
+
+ /* Load the kernel modules early, so that we kdbus.ko is loaded before kdbusfs shall be mounted */
if (!skip_setup)
kmod_setup();
-#endif
r = mount_setup(loaded_policy);
if (r < 0)