chiark / gitweb /
core: uninstall cgroup agent only if we are running outside of a container
authorLennart Poettering <lennart@poettering.net>
Wed, 10 Jul 2013 21:50:28 +0000 (23:50 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 10 Jul 2013 21:50:28 +0000 (23:50 +0200)
Since the cgroupfs is currently not virtualized for containers we
shouldn't reset the hosts agent from the container.

src/core/main.c

index efc5791..0ba1d15 100644 (file)
@@ -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);