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: [PATCH] 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 +++++----
 src/core/mount-setup.c | 18 ------------------
 src/core/mount-setup.h |  2 --
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/core/main.c b/src/core/main.c
index d563ae350..59a2be97f 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();
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index e9a2ec688..df9d9da83 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -108,9 +108,6 @@ static const MountPoint mount_table[] = {
         { "efivarfs",   "/sys/firmware/efi/efivars", "efivarfs",   NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
           is_efi_boot, MNT_NONE },
 #endif
-};
-
-static const MountPoint mount_table_late[] = {
 #ifdef ENABLE_KDBUS
         { "kdbusfs",    "/sys/fs/kdbus",             "kdbusfs",    NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
           NULL,       MNT_IN_CONTAINER },
@@ -228,21 +225,6 @@ int mount_setup_early(void) {
         return r;
 }
 
-int mount_setup_late(void) {
-        unsigned i;
-        int r = 0;
-
-        for (i = 0; i < ELEMENTSOF(mount_table_late); i ++)  {
-                int j;
-
-                j = mount_one(mount_table_late + i, false);
-                if (r == 0)
-                        r = j;
-        }
-
-        return r;
-}
-
 int mount_cgroup_controllers(char ***join_controllers) {
         _cleanup_set_free_free_ Set *controllers = NULL;
         _cleanup_fclose_ FILE *f;
diff --git a/src/core/mount-setup.h b/src/core/mount-setup.h
index 928bd6edf..b32fbc5a5 100644
--- a/src/core/mount-setup.h
+++ b/src/core/mount-setup.h
@@ -24,8 +24,6 @@
 #include <stdbool.h>
 
 int mount_setup_early(void);
-int mount_setup_late(void);
-
 int mount_setup(bool loaded_policy);
 
 int mount_cgroup_controllers(char ***join_controllers);
-- 
2.30.2