Skip to content
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
merged 2 commits into from
Jul 26, 2022

Conversation

jepio
Copy link
Contributor

@jepio jepio commented Jul 25, 2022

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 entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update)

@jepio jepio requested a review from a team July 25, 2022 17:02
Copy link
Contributor

@tormath1 tormath1 left a comment

Choose a reason for hiding this comment

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

Nice catch! Let's wait for the CI - in the meantime, could you add a bugfix changelog entry please?

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.
@jepio jepio force-pushed the jepio/systemd-resolve.conf branch from 931aa35 to 0522847 Compare July 26, 2022 08:54
@jepio
Copy link
Contributor Author

jepio commented Jul 26, 2022

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.

@jepio jepio force-pushed the jepio/systemd-resolve.conf branch from 0522847 to 5768efc Compare July 26, 2022 09:06
@jepio jepio merged commit 5539377 into main Jul 26, 2022
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
@jepio jepio deleted the jepio/systemd-resolve.conf branch July 26, 2022 09:09
@dongsupark dongsupark added bug Something isn't working main labels Jul 26, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants