From 2e75e2a8f56d0d5340dc9fb6fed1f6c4b37c495f Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@zonque.org>
Date: Fri, 14 Nov 2014 15:18:56 +0100
Subject: mount-setup: remove mount_setup_late()

Turns out we can just do kmod_setup() earlier, before we do mount_setup(),
so there's no need for mount_setup_late() anymore. Instead, put kdbusfs in
mount_table[].
---
 src/core/main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/core/main.c')

diff --git a/src/core/main.c b/src/core/main.c
index d563ae3509..59a2be97f3 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1389,6 +1389,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) {
+#ifdef HAVE_KMOD
+                if (!skip_setup)
+                        kmod_setup();
+#endif
+
                 r = mount_setup(loaded_policy);
                 if (r < 0)
                         goto finish;
@@ -1553,10 +1558,6 @@ int main(int argc, char *argv[]) {
                 if (arg_show_status > 0 || plymouth_running())
                         status_welcome();
 
-#ifdef HAVE_KMOD
-                kmod_setup();
-#endif
-                mount_setup_late();
                 hostname_setup();
                 machine_id_setup(NULL);
                 loopback_setup();
-- 
cgit v1.2.3-54-g00ecf