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.
This commit is contained in:
Michael Marineau 2014-05-27 17:01:20 -07:00
parent fa42eee57d
commit 7b89e4e813
2 changed files with 3 additions and 10 deletions

View File

@ -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