From c19739db9ec705b4afdad32301e8750b5e02c7d3 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Wed, 22 Feb 2017 19:55:31 -0500 Subject: cgroup-util: fix the case of default=unified, unified-cgroup-hierarchy=0 We should mount the hybrid hierarchy if the user disabled the unified hierarchy on the kernel command line. --- src/basic/cgroup-util.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/basic') diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 3222428649..f76b7f47e5 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -2447,7 +2447,10 @@ bool cg_is_hybrid_wanted(void) { static thread_local int wanted = -1; int r; bool b; - const bool is_default = DEFAULT_HIERARCHY == CGROUP_UNIFIED_SYSTEMD; + const bool is_default = DEFAULT_HIERARCHY >= CGROUP_UNIFIED_SYSTEMD; + /* We default to true if the default is "hybrid", obviously, + * but also when the default is "unified", because if we get + * called, it means that unified hierarchy was not mounted. */ /* If we have a cached value, return that. */ if (wanted >= 0) -- cgit v1.2.3-54-g00ecf