Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move to cgroups v2 everywhere #1033

Merged
merged 1 commit into from
May 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,3 @@
# similarly to manifest.yaml. Unlike image-base.yaml, which is shared by all
# streams.
include: image-base.yaml

extra-kargs:
# https://github.com/coreos/fedora-coreos-tracker/issues/292
# https://fedoraproject.org/wiki/Changes/CGroupsV2
- systemd.unified_cgroup_hierarchy=0
25 changes: 7 additions & 18 deletions tests/kola/misc-ro
Original file line number Diff line number Diff line change
Expand Up @@ -144,25 +144,14 @@ if ! grep prjquota <<< "${rootflags}"; then
fi
ok "root mounted with prjquota"

# make sure the system is on cgroups v2
has_cgroup_karg=1
grep -q systemd.unified_cgroup_hierarchy /proc/cmdline || has_cgroup_karg=0
sys_fs_cgroup_source=$(findmnt -no SOURCE /sys/fs/cgroup)
stream=$(rpm-ostree status -b --json | jq -r '.deployments[0]["base-commit-meta"]["fedora-coreos.stream"]')
case "$stream" in
"testing-devel" | "testing" | "stable")
if [ $has_cgroup_karg == 0 ]; then
fatal "missing systemd.unified_cgroup_hierarchy=0"
fi
if [[ $sys_fs_cgroup_source != tmpfs ]]; then
fatal "/sys/fs/cgroup is not tmpfs"
fi
;;
*)
if [ $has_cgroup_karg == 1 ]; then
fatal "found systemd.unified_cgroup_hierarchy=0"
fi
if [[ $sys_fs_cgroup_source != cgroup2 ]]; then
fatal "/sys/fs/cgroup is not cgroup2"
fi
;;
esac
if [ $has_cgroup_karg == 1 ]; then
fatal "found systemd.unified_cgroup_hierarchy=0"
fi
if [[ $sys_fs_cgroup_source != cgroup2 ]]; then
fatal "/sys/fs/cgroup is not cgroup2"
fi