sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix building on gentoo hosts"

Browse Source
This commit is contained in:
Jenkins 2016-02-27 14:44:46 +00:00 committed by Gerrit Code Review
commit 103b7dea6d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/gentoo/bin/install-packages
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'
if ! grep -q /dev/shm /proc/mounts; then
fix_shm fix_shm
emerge $@ emerge $@
unfix_shm unfix_shm
else
emerge $@
fi
} }
TEMP="$(getopt -o huem: -n ${SCRIPTNAME} -- ${@})" TEMP="$(getopt -o huem: -n ${SCRIPTNAME} -- ${@})"

2
elements/gentoo/environment.d/00-gentoo-distro-name.bash
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'}