This repository was archived by the owner on May 30, 2023. It is now read-only.
sys-apps/systemd: fix tmpfile entry for resolv.conf link#2057
Merged
Conversation
tormath1
reviewed
Jul 25, 2022
Contributor
tormath1
left a comment
There was a problem hiding this comment.
Nice catch! Let's wait for the CI - in the meantime, could you add a bugfix changelog entry please?
JAORMX
approved these changes
Jul 25, 2022
Our ebuild modifies the systemd owned tmpfiles.d entry that creates the /etc/resolv.conf symlink to point to resolv.conf instead of stub-resolv.conf. The file that contains that entry changed from etc.conf.in to systemd-resolve.conf, so update the ebuild to touch that file.
931aa35 to
0522847
Compare
Contributor
Author
|
Thanks for the review @JAORMX and @tormath1. The CI looks good: http://jenkins.infra.kinvolk.io:8080/job/os/job/kola/job/qemu/851/cldsv/ (after implementing a test for the resolv.conf). Also manually inspected the image and verified that the symlink is correctly created. |
JAORMX
approved these changes
Jul 26, 2022
tormath1
reviewed
Jul 26, 2022
tormath1
approved these changes
Jul 26, 2022
0522847 to
5768efc
Compare
jepio
added a commit
that referenced
this pull request
Jul 26, 2022
sys-apps/systemd: fix tmpfile entry for resolv.conf link
jepio
added a commit
that referenced
this pull request
Jul 26, 2022
sys-apps/systemd: fix tmpfile entry for resolv.conf link
jepio
added a commit
that referenced
this pull request
Jul 26, 2022
sys-apps/systemd: fix tmpfile entry for resolv.conf link
8 tasks
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
sys-apps/systemd: fix tmpfile entry for resolv.conf link
Our ebuild modifies the systemd owned tmpfiles.d entry that creates the
/etc/resolv.conf symlink to point to resolv.conf instead of stub-resolv.conf.
The file that contains that entry changed from etc.conf.in to
systemd-resolve.conf, so update the ebuild to touch that file.
How to use
[ describe what reviewers need to do in order to validate this PR ]
Testing done
Added new kola test: flatcar/mantle#346 which fails on main and succeeds on this branch.
changelog/directory (user-facing change, bug fix, security fix, update)