summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2015-07-05 11:25:38 +0200
committerDavid Herrmann <dh.herrmann@gmail.com>2015-07-05 11:25:38 +0200
commit1f49dffc0fcd9859feb1b97e1e3983d0b911f425 (patch)
tree3882115b49d6089d44b86ef7782ba578cebc9f1f
parent0db83ad7334809a6605501e24bad55f3b652c072 (diff)
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.
-rw-r--r--src/core/mount-setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 42a6b952b9..163b35f83a 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,