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

Make preinstall.d more deterministic

Browse Source 
Reorders the preinstall, making the order more explicit.  Also dedupes
some folder setup.

Change-Id: I423dcba169558ff6037a3382b997675722e77405
This commit is contained in:
Matthew Thode 2017-10-31 21:50:15 -05:00 committed by Ian Wienand
parent f74e48799d
commit c886c4cbe1
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-migrate-pax → diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-01-migrate-pax
View File

6
diskimage_builder/elements/gentoo/pre-install.d/03-gentoo-flags → diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-02-flags
View File

@ -6,8 +6,12 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
mkdir -p /etc/portage/package.use # get the directories in order
mkdir -p /etc/portage/profile
mkdir -p /etc/portage/package.keywords mkdir -p /etc/portage/package.keywords
mkdir -p /etc/portage/package.mask
mkdir -p /etc/portage/package.unmask
mkdir -p /etc/portage/package.use
# needed in order to install pip packages as root # needed in order to install pip packages as root
echo 'dev-python/pip vanilla' >> /etc/portage/package.use/pip echo 'dev-python/pip vanilla' >> /etc/portage/package.use/pip

5
diskimage_builder/elements/gentoo/pre-install.d/10-install-desired-python → diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-04-install-desired-python
View File

@ -18,11 +18,6 @@ if [[ ! -f /usr/portage/profiles ]]; then
emerge-webrsync -q emerge-webrsync -q
fi fi
# get the directories in order
mkdir -p /etc/portage/profile
mkdir -p /etc/portage/package.keywords
mkdir -p /etc/portage/package.use
# python-3.6 and python-3.5 are masked and considered unstable for some reason # python-3.6 and python-3.5 are masked and considered unstable for some reason
echo "PYTHON_TARGETS=\"${GENTOO_PYTHON_TARGETS}\"" >> /etc/portage/make.conf echo "PYTHON_TARGETS=\"${GENTOO_PYTHON_TARGETS}\"" >> /etc/portage/make.conf
if [[ "${GENTOO_PYTHON_TARGETS}" == *"python3_6"* ]]; then if [[ "${GENTOO_PYTHON_TARGETS}" == *"python3_6"* ]]; then