openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "update Gentoo Hardened profiles (now stable)"

This commit is contained in:
Zuul 2018-02-28 11:42:51 +00:00 committed by Gerrit Code Review
parent 05a44e2181 6b3c22dd75
commit 3fb0950808
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage_builder/elements/gentoo/README.rst
View File

@ -28,8 +28,8 @@ Notes:
default/linux/amd64/17.0
default/linux/amd64/17.0/no-multilib
hardened/linux/amd64
hardened/linux/amd64/no-multilib
default/linux/amd64/17.0/hardened
default/linux/amd64/17.0/no-multilib/hardened
* You can set the GENTOO_PORTAGE_CLEANUP environment variable to true (or
anything other than False) to clean up portage from the system and get the

8
diskimage_builder/elements/gentoo/root.d/10-gentoo-image
View File

@ -45,18 +45,18 @@ if [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0" ]]; then
elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/no-multilib" ]]; then
FILENAME_BASE='gentoo-stage4-nomultilib'
SIGNED_SOURCE_SUFFIX='minimal-nomultilib'
elif [[ "${GENTOO_PROFILE}" == "hardened/linux/amd64" ]]; then
elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/hardened" ]]; then
FILENAME_BASE='gentoo-stage4-hardened'
SIGNED_SOURCE_SUFFIX='hardened+minimal'
elif [[ "${GENTOO_PROFILE}" == "hardened/linux/amd64/no-multilib" ]]; then
elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/no-multilib/hardened" ]]; then
FILENAME_BASE='gentoo-stage4-hardened-nomultilib'
SIGNED_SOURCE_SUFFIX='hardened+minimal-nomultilib'
else
echo 'invalid profile, please select from the following profiles'
echo 'default/linux/amd64/17.0'
echo 'default/linux/amd64/17.0/no-multilib'
echo 'hardened/linux/amd64'
echo 'hardened/linux/amd64/no-multilib'
echo 'default/linux/amd64/17.0/hardened'
echo 'default/linux/amd64/17.0/no-multilib/hardened'
exit 1
fi