From 4e86e2c3aac1578220eb677e78a9c75e30287b14 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 28 Sep 2020 17:46:31 +0200 Subject: [PATCH] sys-apps/systemd: Drop the resolv.conf workaround This was to work around an issue https://github.com/systemd/systemd/issues/3826, which is now resolved in https://github.com/systemd/systemd/pull/5276. --- .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index aefba443c4..4b2315117e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -179,14 +179,6 @@ src_unpack() { src_prepare() { # Flatcar: We don't have separate patches, so no patching code here. - # - # Flatcar: Use the resolv.conf managed by systemd-resolved. - # This shouldn't be necessary anymore. Added because of a bug - # https://github.com/systemd/systemd/issues/3826, which is - # apparently resolved in - # https://github.com/systemd/systemd/pull/5276. - sed -i -e 's,/run/systemd/resolve/stub-resolv.conf,/run/systemd/resolve/resolv.conf,' tmpfiles.d/etc.conf.m4 || die - default }