From 0e677209da46d4e325ada2db55e47fb9d66cbad9 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 15 Jul 2014 17:24:05 -0700 Subject: [PATCH] systemd: add compatibility symlink for resolv.conf In 215 resolv.conf moved from /run/systemd/network to /run/systemd/resolv but there isn't anything to fix references to the old location (namely existing /etc/resolv.conf symlinks after upgrades). Adding this rule ensures that those links or any other references continue to work as they did before. --- .../coreos-overlay/sys-apps/systemd/files/systemd-resolv.conf | 2 ++ .../systemd/{systemd-215-r2.ebuild => systemd-215-r3.ebuild} | 1 + .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 1 + 3 files changed, 4 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-resolv.conf rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-215-r2.ebuild => systemd-215-r3.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-resolv.conf b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-resolv.conf new file mode 100644 index 0000000000..32b7e9d214 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-resolv.conf @@ -0,0 +1,2 @@ +d /run/systemd/network - - - - - +L /run/systemd/network/resolv.conf - - - - ../resolve/resolv.conf diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r3.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r3.ebuild index 36e3b4ba50..3472d67633 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r3.ebuild @@ -361,6 +361,7 @@ multilib_src_install_all() { mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf + systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf # Don't default to graphical.target rm "${D}"/usr/lib/systemd/system/default.target || die 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 41bdc7d1ff..8d1131d20c 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 @@ -352,6 +352,7 @@ multilib_src_install_all() { mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf + systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf # Don't default to graphical.target rm "${D}"/usr/lib/systemd/system/default.target || die