Fix building on gentoo hosts

This patch fixes the profile autodetect.  If the profile was passed at install
time, it would overridden by the environment.d script.  This was fixed by
accepting the value passed by the user, if one was passed.

The enviroment.d file is run outside of chroot, because of this eselect will
not be available on non-gentoo systems.  We change the behavior to work
elsewhere, it was not working on non-gentoo systems and giving bad results on
gentoo systems (returing values from the host, not the guest being built).

This patch also fixes shm detection by checking if it is mounted already.

Change-Id: Ie58d8e19529a731bfbc9eeb4bb246988d1aaa772
This commit is contained in:
Matthew Thode 2016-02-19 00:06:38 -06:00
parent 352e58ceb7
commit dacfc23c36
No known key found for this signature in database
GPG Key ID: 64A37BEAAE19A4E8
2 changed files with 8 additions and 4 deletions

View File

@ -58,9 +58,13 @@ function unfix_shm {
function install_gentoo_packages { function install_gentoo_packages {
RUN_ONCE_SHM='1' RUN_ONCE_SHM='1'
fix_shm if ! grep -q /dev/shm /proc/mounts; then
emerge $@ fix_shm
unfix_shm emerge $@
unfix_shm
else
emerge $@
fi
} }
TEMP="$(getopt -o huem: -n ${SCRIPTNAME} -- ${@})" TEMP="$(getopt -o huem: -n ${SCRIPTNAME} -- ${@})"

View File

@ -1,2 +1,2 @@
export DISTRO_NAME=gentoo export DISTRO_NAME=gentoo
export GENTOO_PROFILE=$(eselect profile show | tail -n 1) export GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/13.0'}