From 19b4932ee26acae208c7508e31de9b538b5df449 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 12 Aug 2016 14:22:01 -0700 Subject: [PATCH] sys-apps/systemd: revert to the previous /etc/resolv.conf When systemd-resolved is the local resolver on 127.0.0.53:53 (the default since v231), some CNAME records are never fully resolved to an IP address. This switches the /etc/resolv.conf symlink to its location from earlier versions as a workaround. --- .../systemd/{systemd-231-r1.ebuild => systemd-231-r2.ebuild} | 0 .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 2 ++ 2 files changed, 2 insertions(+) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-231-r1.ebuild => systemd-231-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-231-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-231-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-231-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-231-r2.ebuild 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 03260a9223..42fd1be9e5 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 @@ -157,6 +157,8 @@ src_unpack() { src_prepare() { # Bug 463376 sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die + # Bug https://github.com/systemd/systemd/issues/3826 + sed -i -e 's,/usr/lib/systemd/resolv.conf,/run/systemd/resolve/resolv.conf,' tmpfiles.d/etc.conf.m4 || die [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )