summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-03-22 04:40:05 +0100
committerLennart Poettering <lennart@poettering.net>2013-03-22 04:43:27 +0100
commite2b1eb2661e95c8e3d03c5f7183a234fea990b68 (patch)
tree47e6e07213835a137f622e2b13b48071c9aa9cba /src
parent6c142648aaced56ab681fcc97a71b06d588122a9 (diff)
main: don't mount cgroup controller unless PID == 1
This completes c1dae1b3c9729fb8ab749dd4e2dad07e0fad7ed8 in a way.
Diffstat (limited to 'src')
-rw-r--r--src/core/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/main.c b/src/core/main.c
index 01a6d41fb4..21c0d274c6 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1582,7 +1582,7 @@ int main(int argc, char *argv[]) {
if (getpid() == 1)
install_crash_handler();
- if (geteuid() == 0 && !getenv("SYSTEMD_SKIP_API_MOUNTS")) {
+ if (getpid() == 1) {
r = mount_cgroup_controllers(arg_join_controllers);
if (r < 0)
goto finish;