From d9972d4ad15d4a70ff78b5adda091edb1799035d Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Mon, 25 Jul 2022 18:55:06 +0200 Subject: [PATCH 1/2] 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. --- .../coreos-overlay/sys-apps/systemd/systemd-250.3-r1.ebuild | 1 + .../coreos-overlay/sys-apps/systemd/systemd-250.3.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-250.3-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-250.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-250.3-r1.ebuild new file mode 120000 index 0000000000..5446582e48 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-250.3-r1.ebuild @@ -0,0 +1 @@ +systemd-250.3.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-250.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-250.3.ebuild index a1a32828b0..e67f3e3e44 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-250.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-250.3.ebuild @@ -272,7 +272,7 @@ src_prepare() { # /run/systemd/resolve/stub-resolv.conf (and if using K8s # configure the kubelet resolvConf variable/--resolv-conf flag # to /run/systemd/resolve/resolv.conf). - sed -i -e 's,/run/systemd/resolve/stub-resolv.conf,/run/systemd/resolve/resolv.conf,' tmpfiles.d/etc.conf.in || die + sed -i -e 's,/run/systemd/resolve/stub-resolv.conf,/run/systemd/resolve/resolv.conf,' tmpfiles.d/systemd-resolve.conf || die default } From 36ecad566a63f387b828ae36ec4458a51196eac3 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 26 Jul 2022 10:53:35 +0200 Subject: [PATCH 2/2] changelog: add entry for resolv.conf bugfix --- .../changelog/bugfixes/2022-07-26-restore-resolv-conf.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-07-26-restore-resolv-conf.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-07-26-restore-resolv-conf.md b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-07-26-restore-resolv-conf.md new file mode 100644 index 0000000000..38a68be572 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-07-26-restore-resolv-conf.md @@ -0,0 +1 @@ +- Fixed `/etc/resolv.conf` symlink by pointing it at `resolv.conf` instead of `stub-resolv.conf`. This bug was present since the update to systemd v250 ([coreos-overlay#2057](https://github.com/flatcar-linux/coreos-overlay/pull/2057))