summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-10-28 12:15:26 +0000
committerGitHub <noreply@github.com>2021-10-28 12:15:26 +0000
commitf16b13366424468246a2c78414e2c92142393f6e (patch)
tree6b12ded05ff6fb12165b735d043f1f0aec4ae8aa
parenta05a445f48877006bccf9cd5399279cdfec7a790 (diff)
parent9e5cd32056f4a497908fd24588b0f68aa645f3e3 (diff)
downloadpodman-f16b13366424468246a2c78414e2c92142393f6e.tar.gz
podman-f16b13366424468246a2c78414e2c92142393f6e.tar.bz2
podman-f16b13366424468246a2c78414e2c92142393f6e.zip
Merge pull request #12120 from giuseppe/rename-cgroup-subtree
oci: rename sub-cgroup to runtime instead of supervisor
-rw-r--r--libpod/oci_conmon_linux.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index 1719b2dfa..db906fabb 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -1016,7 +1016,7 @@ func (r *ConmonOCIRuntime) createOCIContainer(ctr *Container, restoreOptions *Co
}
if ctr.config.CgroupsMode == cgroupSplit {
- if err := utils.MoveUnderCgroupSubtree("supervisor"); err != nil {
+ if err := utils.MoveUnderCgroupSubtree("runtime"); err != nil {
return err
}
}