| From fb36bef4e4884a62b70cd98f7d2d52abf8091106 Mon Sep 17 00:00:00 2001 |
| From: Martin Pitt <martin.pitt@ubuntu.com> |
| Date: Thu, 10 Nov 2016 05:33:13 +0100 |
| Subject: [PATCH] core: don't use the unified hierarchy for the systemd cgroup |
| yet (#4628) |
| |
| Too many things don't get along with the unified hierarchy yet: |
| |
| * https://github.com/opencontainers/runc/issues/1175 |
| * https://github.com/docker/docker/issues/28109 |
| * https://github.com/lxc/lxc/issues/1280 |
| |
| So revert the default to the legacy hierarchy for now. Developers of the above |
| software can opt into the unified hierarchy with |
| "systemd.legacy_systemd_cgroup_controller=0". |
| (cherry picked from commit 843d5baf6aad6c53fc00ea8d95d83209a4f92de1) |
| --- |
| src/basic/cgroup-util.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c |
| index cede835920..134e6e3664 100644 |
| --- a/src/basic/cgroup-util.c |
| +++ b/src/basic/cgroup-util.c |
| @@ -2423,10 +2423,10 @@ bool cg_is_unified_systemd_controller_wanted(void) { |
| |
| r = get_proc_cmdline_key("systemd.legacy_systemd_cgroup_controller=", &value); |
| if (r < 0) |
| - return true; |
| + return false; |
| |
| if (r == 0) |
| - wanted = true; |
| + wanted = false; |
| else |
| wanted = parse_boolean(value) <= 0; |
| } |