From 8bf7e09970e71fd866f44b9c51ceeea785a3a404 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 14 Feb 2014 19:18:39 -0800 Subject: [PATCH] fix(sys-apps/baselayout): Assorted cleanups/fixes - Add || die to commands without them to avoid missing errors. - Symlink resolv.conf to /run on amd64-generic images again. - Properly sed /etc/issue out of tmpfiles. - Fix symlinks for mtab and sudo. - Fix directory ordering in tmpfiles. - Update groups, a few were missing or incorrect. - Bump coreos-base/coreos revision. --- ...1-r220.ebuild => coreos-0.0.1-r221.ebuild} | 0 ....0.0.ebuild => baselayout-3.0.0-r4.ebuild} | 0 .../baselayout/baselayout-9999.ebuild | 20 +++++++++++-------- 3 files changed, 12 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r220.ebuild => coreos-0.0.1-r221.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.0.0.ebuild => baselayout-3.0.0-r4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r220.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r221.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r220.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r221.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r4.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 d1ab1d063e..35d360c530 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 @@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="0cb1ea85886399fa3077df6866167104932aaed3" + CROS_WORKON_COMMIT="b357b8e3d87851ef821353624e0d872ee1f229da" KEYWORDS="amd64 arm x86" fi @@ -129,30 +129,34 @@ src_install() { for libdir in $(get_all_libdirs) ; do ldpaths+=":/${libdir}:/usr/${libdir}:/usr/local/${libdir}" done - echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic + echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic || die 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 sed -i -e 's/^core:x:500:/core:x:1000:/' \ "${D}"/usr/share/baselayout/group || die # make sure the home dir ownership is correct - fowners -R 1000:1000 /home/core + fowners -R 1000:1000 /home/core || die else - fowners -R 500:500 /home/core + fowners -R 500:500 /home/core || die fi if use cros_host; then # Provided by vim in the SDK - rm -r "${D}"/etc/vim + rm -r "${D}"/etc/vim || die else - # Don't install /etc/issue since it is handled by coreos-init - rm "${D}"/etc/issue - sed -i -e '%/etc/issue%d' "${D}"/usr/lib/tmpfiles.d/baselayout-etc.conf + # Don't install /etc/issue since it is handled by coreos-init right now + rm "${D}"/etc/issue || die + sed -i -e '/\/etc\/issue/d' \ + "${D}"/usr/lib/tmpfiles.d/baselayout-etc.conf || die # Set custom password for core user if [[ -r "${SHARED_USER_PASSWD_FILE}" ]]; then