From: David Herrmann <dh.herrmann@gmail.com>
Date: Sun, 5 Jul 2015 09:25:38 +0000 (+0200)
Subject: core: don't mount kdbusfs if not wanted
X-Git-Tag: v222~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f49dffc0fcd9859feb1b97e1e3983d0b911f425;p=thirdparty%2Fsystemd.git

core: don't mount kdbusfs if not wanted

Just like we conditionalize loading kdbus.ko, we should conditionalize
mounting kdbusfs. Otherwise, we might run with kdbus if it is builtin,
even though the user didn't want this.
---

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 42a6b952b96..163b35f83ab 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -105,7 +105,7 @@ static const MountPoint mount_table[] = {
           is_efi_boot,   MNT_NONE                   },
 #endif
         { "kdbusfs",    "/sys/fs/kdbus",             "kdbusfs",    NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
-          NULL,       MNT_IN_CONTAINER },
+          is_kdbus_wanted,       MNT_IN_CONTAINER },
 };
 
 /* These are API file systems that might be mounted by other software,