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

Merge "Fix Gentoo builds on Ubuntu 16.04 Xenial hosts"

Browse Source
This commit is contained in:
Jenkins 2017-01-12 23:07:27 +00:00 committed by Gerrit Code Review
commit 14957664d4
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
elements/gentoo/bin/install-packages
View File

@ -33,15 +33,25 @@ function show_options {
} }
function fix_shm { function fix_shm {
# make /dev/shm dir if it doesn't exist
# mount tmpfs and chown it
# existing programs could be using /dev/shm
# This means it cannot be moved or backed
# up as a copy easily. The only remaining
# option is to move the link if it exists
# as a link. Existing programs will still
# hold the file handle of the original
# location open and new programs can use
# the fixed /dev/shm.
if [[ "${RUN_ONCE_SHM}" == '1' ]]; then if [[ "${RUN_ONCE_SHM}" == '1' ]]; then
if [[ -L /dev/shm.orig ]]; then if [[ ! -d /dev/shm ]]; then
rm /dev/shm.orig if [[ ! -e /dev/shm ]]; then
fi if [[ -L /dev/shm ]]; then
if [[ -d /dev/shm.orig ]]; then
rm -Rf /dev/shm.orig
fi
mv /dev/shm /dev/shm.orig mv /dev/shm /dev/shm.orig
fi
mkdir /dev/shm mkdir /dev/shm
fi
fi
mount -t tmpfs none /dev/shm mount -t tmpfs none /dev/shm
chmod 1777 /dev/shm chmod 1777 /dev/shm
RUN_ONCE_SHM='0' RUN_ONCE_SHM='0'
@ -49,11 +59,17 @@ function fix_shm {
} }
function unfix_shm { function unfix_shm {
# unmount tmpfs
# care about anything still using it
if [[ "${RUN_ONCE_SHM}" == '0' ]]; then if [[ "${RUN_ONCE_SHM}" == '0' ]]; then
umount /dev/shm umount /dev/shm
if fuser /dev/shm; then
rmdir /dev/shm rmdir /dev/shm
fi
if [[ -e /dev/shm.orig ]]; then
mv /dev/shm.orig /dev/shm mv /dev/shm.orig /dev/shm
fi fi
fi
} }
function install_gentoo_packages { function install_gentoo_packages {