From 2e75e2a8f56d0d5340dc9fb6fed1f6c4b37c495f Mon Sep 17 00:00:00 2001 From: Daniel Mack 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/mount-setup.c | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/core/mount-setup.c') diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index e9a2ec6886..df9d9da831 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; -- cgit v1.2.3-54-g00ecf