From 7b89e4e813497ca0a71e80ca3306c5e1a8b1d283 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 27 May 2014 17:01:20 -0700 Subject: [PATCH] feat(sys-apps/baselayout): Stop changing the core user's UID The SDK does not set the `symlink-usr` flag so it has stuck with the old amd64-generic behavior of setting the core user's UID to 1000. In order to make running the SDK on CoreOS reasonably sane switch to 500 on both. --- ...out-3.0.0-r16.ebuild => baselayout-3.0.1.ebuild} | 0 .../sys-apps/baselayout/baselayout-9999.ebuild | 13 +++---------- 2 files changed, 3 insertions(+), 10 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.0.0-r16.ebuild => baselayout-3.0.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r16.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r16.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.1.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 55bfc18dfc..cec73de9bc 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 @@ -142,18 +142,11 @@ src_install() { if ! use symlink-usr ; then # modprobe uses /lib instead of /usr/lib mv "${D}"/usr/lib/modprobe.d "${D}"/lib/modprobe.d || die - - # 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 || die - else - fowners -R 500:500 /home/core || die fi + # For compatibility with older SDKs which use 1000 for the core user. + fowners -R 500:500 /home/core || die + if use cros_host; then # Provided by vim in the SDK rm -r "${D}"/etc/vim || die