Repository navigation
Add --cgroup-manager, deprecate --systemd-cgroup - #5570
Merged
Merged
Conversation
kolyshkin
force-pushed
the
cgroup-manager
branch
from
October 20, 2026 21:03
dc684a6 to
9685b53
Compare
AkihiroSuda
approved these changes
Oct 21, 2026
Add a new --cgroup-manager global option, accepting either "cgroupfs" (the default) or "systemd". It is compatible with the option of the same name crun has (except crun also has "disabled"). This helps tools which run either runc or crun, for example, crun's test suite, which can now be run against runc. Deprecate --systemd-cgroup in favor of --cgroup-manager=systemd. It is still supported (and there are no plans to remove it), but conflicts with --cgroup-manager set to anything other than systemd. Switch the integration tests to use the new option, and add a few tests for the new and the deprecated option. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin
force-pushed
the
cgroup-manager
branch
from
October 28, 2026 06:00
9685b53 to
e4b7065
Compare
kolyshkin
commented
Oct 28, 2026
kolyshkin
left a comment
kolyshkin
left a comment
Contributor
Author
There was a problem hiding this comment.
ok i think we can merge this one
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add a new global option:
with
cgroupfsas default.This is compatible with the option of the same name in crun and podman. As for dockerd, it has
native.cgroupdriver=systemd|cgroupfs.This is a step to have
--cgroup-manager disabled(which is already supported by podman and crun)Also,
--systemd-cgroupis deprecated in favor of--cgroup-manager=systemd. It is still supported and there are no plans to remove it.The integration tests are switched to the new option, and a few tests are added for the new option and the deprecated one.