From 2ee19425cab756cf30132ee09fe7dd0701806885 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 4 Mar 2014 10:49:35 -0800 Subject: [PATCH] fix(sys-apps/baselayout): Do not symlink resolv.conf to /run in SDK --- ...elayout-3.0.0-r5.ebuild => baselayout-3.0.0-r6.ebuild} | 0 .../sys-apps/baselayout/baselayout-9999.ebuild | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.0.0-r5.ebuild => baselayout-3.0.0-r6.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r6.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild index ff9ed108b5..519b6e8456 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild @@ -132,13 +132,15 @@ src_install() { done echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic || die + if ! use symlink-usr && ! use cros_host; then + # move resolv.conf to a writable location + dosym /run/resolv.conf /etc/resolv.conf + fi + if ! use symlink-usr ; then # modprobe uses /lib instead of /usr/lib mv "${D}"/usr/lib/modprobe.d "${D}"/lib/modprobe.d || die - # move resolv.conf to a writable location - dosym /run/resolv.conf /etc/resolv.conf - # core is UID:GID 1000:1000 in old images sed -i -e 's/^core:x:500:500:/core:x:1000:1000:/' \ "${D}"/usr/share/baselayout/passwd || die