X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmain.c;h=64acdf76e1dbecf63237b4fb5c23c7ce6b6b87c0;hb=f44b9efcec4594eb8f843325ee3079b44fb8f24a;hp=56a1f6193c974d2316fd93b784b7bf7768e166e2;hpb=b5884878a2874447b2a9f07f324a7cd909d96d48;p=elogind.git

diff --git a/src/core/main.c b/src/core/main.c
index 56a1f6193..64acdf76e 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,6 +1387,11 @@ int main(int argc, char *argv[]) {
         /* Mount /proc, /sys and friends, so that /proc/cmdline and
          * /proc/$PID/fd is available. */
         if (getpid() == 1) {
+
+                /* Load the kernel modules early, so that we kdbus.ko is loaded before kdbusfs shall be mounted */
+                if (!skip_setup)
+                        kmod_setup();
+
                 r = mount_setup(loaded_policy);
                 if (r < 0)
                         goto finish;
@@ -1553,9 +1556,6 @@ int main(int argc, char *argv[]) {
                 if (arg_show_status > 0 || plymouth_running())
                         status_welcome();
 
-#ifdef HAVE_KMOD
-                kmod_setup();
-#endif
                 hostname_setup();
                 machine_id_setup(NULL);
                 loopback_setup();