Merge pull request #6418 from bobbypage/cgroupv2-cos-fix

test: e2e node COS cgroupv2 script
This commit is contained in:
Phil Estes 2022-01-10 11:07:14 -05:00 committed by GitHub
commit 62a4e7020d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -30,7 +30,7 @@ if [ "${CONTAINERD_CGROUPV2:-"false"}" == "true" ]; then
OS_ID="$(. /etc/os-release && echo "$ID")"
fi
if [ "${OS_ID}" = "cos" ]; then
if ! grep -q 'systemd.unified_cgroup_hierarchy=true' /proc/cmdline; then
if ! grep -q 'systemd.unified_cgroup_hierarchy=true' /proc/cmdline && [ "$(stat -fc %T /sys/fs/cgroup/)" != "cgroup2fs" ]; then
echo "Setting up cgroupv2"
mount_path="/tmp/esp"