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

Determine if resolv.conf points to systemd-resolved #7616

Conversation

EduardoVega
Copy link
Contributor

Fixes #5845

Signed-off-by: Eduardo Vega [email protected]

@EduardoVega EduardoVega force-pushed the 5845-support-for-systemd-resolved branch from 2a31288 to 6a12335 Compare September 12, 2020 05:40
@rhatdan
Copy link
Member

rhatdan commented Sep 12, 2020

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 12, 2020
@TomSweeneyRedHat
Copy link
Member

LGTM
but would like a @vrothberg head nod

@QiWang19
Copy link
Contributor

LGTM

Comment on lines +1386 to +1389
// Determine if symlink points to any of the systemd-resolved files
if strings.HasPrefix(resolvPath, "/run/systemd/resolve/") {
resolvPath = "/run/systemd/resolve/resolv.conf"
}
Copy link
Member

Choose a reason for hiding this comment

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

Just a nit-pick: The logic for retrieving the resolvPath seems to be scattered around in the implementation and I would prefer having it in a own function.

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EduardoVega, rhatdan, saschagrunert

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

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@vrothberg
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 14, 2020
@openshift-merge-robot openshift-merge-robot merged commit b7936b5 into containers:master Sep 14, 2020
@EduardoVega EduardoVega deleted the 5845-support-for-systemd-resolved branch September 15, 2020 23:14
@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 24, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 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.

Coming issue on handling /etc/resolv.conf, when it uses systemd-resolve
8 participants