From: David Herrmann <dh.herrmann@gmail.com>
Date: Sun, 18 Jan 2015 22:54:42 +0000 (+0100)
Subject: core: write kdbus.attach_flags_mask only on real boot
X-Git-Tag: v219~449
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=90b99192ad5b7674585996e2b801679989f8a8a7;p=elogind.git

core: write kdbus.attach_flags_mask only on real boot

The kernel module system is not namespaced, so no container should ever
modify global options. Make sure we set the kdbus attach_flags_mask only
on a real boot as PID1.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index e53f22215..64ff4644a 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -708,7 +708,7 @@ static int manager_setup_kdbus(Manager *m) {
         if (m->test_run || m->kdbus_fd >= 0)
                 return 0;
 
-        if (getpid() == 1)
+        if (m->running_as == SYSTEMD_SYSTEM && detect_container(NULL) <= 0)
                 bus_kernel_fix_attach_mask();
 
         m->kdbus_fd = bus_kernel_create_bus(