mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-12 09:46:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2395 from lifubang/updateCgroupv2

Browse Source 
Partially revert "CreateCgroupPath: only enable needed controllers"
This commit is contained in:
Akihiro Suda
2020-05-25 13:56:23 +09:00
committed by GitHub
parent 3c8da9dae0 275157193c
commit 7673bee6bf
3 changed files with 66 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/cgroups.bats
+11
View File
@@ -110,6 +110,17 @@ EOF
runc run -d --console-socket $CONSOLE_SOCKET test_cgroups_permissions
[ "$status" -eq 0 ]
if [ "$CGROUP_UNIFIED" != "no" ]; then
if [ -n "${RUNC_USE_SYSTEMD}" ] ; then
if [ $(id -u) = "0" ]; then
check_cgroup_value "cgroup.controllers" "$(cat /sys/fs/cgroup/machine.slice/cgroup.controllers)"
else
check_cgroup_value "cgroup.controllers" "$(cat /sys/fs/cgroup/user.slice/user-$(id -u).slice/cgroup.controllers)"
fi
else
check_cgroup_value "cgroup.controllers" "$(cat /sys/fs/cgroup/cgroup.controllers)"
fi
fi
}
@test "runc exec (limits + cgrouppath + permission on the cgroup dir) succeeds" {