Merge pull request #6377 from pembek01/remove-cgroupsv2-check

utils: Remove kata-manager.sh cgroups v2 check
This commit is contained in:
James O. D. Hunt
2023-03-02 17:00:46 +00:00
committed by GitHub

View File

@@ -238,23 +238,6 @@ Advice:
EOF
}
# Determine if the system only supports cgroups v2.
#
# - Writes "true" to stdout if only cgroups v2 are supported.
# - Writes "false" to stdout if cgroups v1 or v1+v2 are available.
# - Writes a blank string to stdout if cgroups are not available.
only_supports_cgroups_v2()
{
local v1=$(mount|awk '$5 ~ /^cgroup$/ { print; }' || true)
local v2=$(mount|awk '$5 ~ /^cgroup2$/ { print; }' || true)
[ -n "$v1" ] && [ -n "$v2" ] && { echo "false"; return 0; } || true
[ -n "$v1" ] && { echo "false"; return 0; } || true
[ -n "$v2" ] && { echo "true"; return 0; } || true
return 0
}
# Return 0 if containerd is already installed, else return 1.
containerd_installed()
{
@@ -280,13 +263,6 @@ pre_checks()
[ "$ret" -eq 0 ] && die "$containerd_project already installed"
local cgroups_v2_only=$(only_supports_cgroups_v2 || true)
local url="https://github.com/kata-containers/kata-containers/issues/927"
[ "$cgroups_v2_only" = "true" ] && \
die "$kata_project does not yet fully support cgroups v2 - see $url"
return 0
}