From: Christian Brauner Date: Wed, 17 Feb 2021 09:08:27 +0000 (+0100) Subject: cgroups: don't move pivot cgroup under the monitor's cgroup X-Git-Tag: lxc-5.0.0~281^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57abfbb640d7ccde951941c960ef383a2c183f27;p=thirdparty%2Flxc.git cgroups: don't move pivot cgroup under the monitor's cgroup Otherwise we will never be able to destroy the monitor's cgroup. Signed-off-by: Christian Brauner --- diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index ddec3ad82..4323c79f3 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -1249,8 +1249,6 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops, if (conf->cgroup_meta.monitor_pivot_dir) pivot_path = must_make_path(conf->cgroup_meta.monitor_pivot_dir, CGROUP_PIVOT, NULL); - else if (conf->cgroup_meta.monitor_dir) - pivot_path = must_make_path(conf->cgroup_meta.monitor_dir, CGROUP_PIVOT, NULL); else if (conf->cgroup_meta.dir) pivot_path = must_make_path(conf->cgroup_meta.dir, CGROUP_PIVOT, NULL); else