chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c89c1c
)
core: write kdbus.attach_flags_mask only on real boot
author
David Herrmann
<dh.herrmann@gmail.com>
Sun, 18 Jan 2015 22:54:42 +0000
(23:54 +0100)
committer
David Herrmann
<dh.herrmann@gmail.com>
Sun, 18 Jan 2015 22:54:42 +0000
(23:54 +0100)
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.
src/core/manager.c
patch
|
blob
|
history
diff --git
a/src/core/manager.c
b/src/core/manager.c
index e53f22215de0ef6566f3112a8aec941b9f940386..64ff4644a81e489842d8b9cd72cbb64bac15d680 100644
(file)
--- 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(