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

rootless cni: resolve absolute symlinks correctly #11360

Merged
merged 1 commit into from
Aug 30, 2021

Conversation

Luap99
Copy link
Member

@Luap99 Luap99 commented Aug 30, 2021

When /etc/resolv.conf is a symlink to an absolute path use it and not
join it the the previous path.

[NO TESTS NEEDED] This depends on the host layout.

Fixes #11358

When /etc/resolv.conf is a symlink to an absolute path use it and not
join it the the previous path.

[NO TESTS NEEDED] This depends on the host layout.

Fixes containers#11358

Signed-off-by: Paul Holzinger <[email protected]>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 30, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99

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 Aug 30, 2021
@WhyNotHugo
Copy link

This works for me, thanks!

@mheon
Copy link
Member

mheon commented Aug 30, 2021

LGTM

@Luap99
Copy link
Member Author

Luap99 commented Aug 30, 2021

@mheon It would be great if you could get this into 3.3.1.

@mheon
Copy link
Member

mheon commented Aug 30, 2021

@containers/podman-maintainers Merge please

@baude
Copy link
Member

baude commented Aug 30, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 30, 2021
@openshift-merge-robot openshift-merge-robot merged commit 4834b73 into containers:main Aug 30, 2021
@Luap99 Luap99 deleted the rootless-resolv branch August 30, 2021 17:15
@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 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Starting containers via docker-compose fails to mount resolv.conf
5 participants