Skip to content

L
lxc
Unverified Commit 57abfbb6 by Christian Brauner
Options

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: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 1e058855
Showing with 0 additions and 2 deletions
src/lxc/cgroups/cgfsng.c
...@@ -1249,8 +1249,6 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops, ...@@ -1249,8 +1249,6 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
if (conf->cgroup_meta.monitor_pivot_dir) if (conf->cgroup_meta.monitor_pivot_dir)
pivot_path = must_make_path(conf->cgroup_meta.monitor_pivot_dir, CGROUP_PIVOT, NULL); 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) else if (conf->cgroup_meta.dir)
pivot_path = must_make_path(conf->cgroup_meta.dir, CGROUP_PIVOT, NULL); pivot_path = must_make_path(conf->cgroup_meta.dir, CGROUP_PIVOT, NULL);
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment