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

Merge "update Gentoo Hardened profiles (now stable)"

Browse Source
This commit is contained in:
Zuul 2018-02-28 11:42:51 +00:00 committed by Gerrit Code Review
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
default/linux/amd64/17.0/no-multilib default/linux/amd64/17.0/no-multilib
hardened/linux/amd64 default/linux/amd64/17.0/hardened
hardened/linux/amd64/no-multilib default/linux/amd64/17.0/no-multilib/hardened
* You can set the GENTOO_PORTAGE_CLEANUP environment variable to true (or * 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 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 elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/no-multilib" ]]; then
FILENAME_BASE='gentoo-stage4-nomultilib' FILENAME_BASE='gentoo-stage4-nomultilib'
SIGNED_SOURCE_SUFFIX='minimal-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' FILENAME_BASE='gentoo-stage4-hardened'
SIGNED_SOURCE_SUFFIX='hardened+minimal' 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' FILENAME_BASE='gentoo-stage4-hardened-nomultilib'
SIGNED_SOURCE_SUFFIX='hardened+minimal-nomultilib' SIGNED_SOURCE_SUFFIX='hardened+minimal-nomultilib'
else else
echo 'invalid profile, please select from the following profiles' echo 'invalid profile, please select from the following profiles'
echo 'default/linux/amd64/17.0' echo 'default/linux/amd64/17.0'
echo 'default/linux/amd64/17.0/no-multilib' echo 'default/linux/amd64/17.0/no-multilib'
echo 'hardened/linux/amd64' echo 'default/linux/amd64/17.0/hardened'
echo 'hardened/linux/amd64/no-multilib' echo 'default/linux/amd64/17.0/no-multilib/hardened'
exit 1 exit 1
fi fi