From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 10 Jul 2013 21:50:28 +0000 (+0200)
Subject: core: uninstall cgroup agent only if we are running outside of a container
X-Git-Tag: v206~152
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=66713f77e851c12452729d37e22ef66673852b8f;p=elogind.git

core: uninstall cgroup agent only if we are running outside of a container

Since the cgroupfs is currently not virtualized for containers we
shouldn't reset the hosts agent from the container.
---

diff --git a/src/core/main.c b/src/core/main.c
index efc5791bb..0ba1d1503 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1943,9 +1943,11 @@ finish:
                         watchdog_close(true);
                 }
 
-                /* avoid the creation of new processes forked by the kernel; at this
-                 * point, we will not listen to the signals anyway */
-                cg_uninstall_release_agent(SYSTEMD_CGROUP_CONTROLLER);
+                /* Avoid the creation of new processes forked by the
+                 * kernel; at this point, we will not listen to the
+                 * signals anyway */
+                if (detect_container(NULL) <= 0)
+                        cg_uninstall_release_agent(SYSTEMD_CGROUP_CONTROLLER);
 
                 execve(SYSTEMD_SHUTDOWN_BINARY_PATH, (char **) command_line, env_block);
                 free(env_block);