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

podman: skip /sys/fs/cgroup/systemd if not present #15668

Conversation

giuseppe
Copy link
Member

@giuseppe giuseppe commented Sep 7, 2022

skip adding the /sys/fs/cgroup/systemd bind mount if it is not already present on the host.

[NO NEW TESTS NEEDED] requires a system without systemd.

Closes: #15647

Signed-off-by: Giuseppe Scrivano [email protected]

Does this PR introduce a user-facing change?

Do not attempt to bind mount `/sys/fs/cgroup/systemd` on cgroup v1 if the mount doesn't already exist on the host

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 7, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 7, 2022
@rhatdan
Copy link
Member

rhatdan commented Sep 7, 2022

LGTM

@rhatdan
Copy link
Member

rhatdan commented Sep 7, 2022

@containers/podman-maintainers PTAL


var statfs unix.Statfs_t
if err := unix.Statfs("/sys/fs/cgroup/systemd", &statfs); err != nil {
if os.IsNotExist(err) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use errors.Is

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I always forget this...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too bad. I wonder if there is linter for this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment addressed and pushed a new version

@mheon
Copy link
Member

mheon commented Sep 7, 2022

Code LGTM once the comment is addressed

skip adding the /sys/fs/cgroup/systemd bind mount if it is not already
present on the host.

[NO NEW TESTS NEEDED] requires a system without systemd.

Closes: containers#15647

Signed-off-by: Giuseppe Scrivano <[email protected]>
@giuseppe giuseppe force-pushed the skip-sys-fs-cgroup-systemd-if-missing branch from eaddeb4 to f75c318 Compare September 7, 2022 13:33
@rhatdan
Copy link
Member

rhatdan commented Sep 7, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 7, 2022
@openshift-merge-robot openshift-merge-robot merged commit 3d482a7 into containers:main Sep 7, 2022
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 20, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Podman in systemd mode fails on non-systemd hosts
5 participants