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

Merge "update gentoo systemd profile to 17.1 from 17.0"

Browse Source
This commit is contained in:
Zuul 2019-08-20 21:21:24 +00:00 committed by Gerrit Code Review
commit 3de4b71b9e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,11 +26,11 @@ Notes:
* Other profiles can be used by exporting GENTOO_PROFILE with a valid profile. * Other profiles can be used by exporting GENTOO_PROFILE with a valid profile.
A list of valid profiles follows: A list of valid profiles follows:
default/linux/amd64/17.0 default/linux/amd64/17.1
default/linux/amd64/17.0/no-multilib default/linux/amd64/17.1/no-multilib
default/linux/amd64/17.0/hardened default/linux/amd64/17.1/hardened
default/linux/amd64/17.0/no-multilib/hardened default/linux/amd64/17.1/no-multilib/hardened
default/linux/amd64/17.0/systemd default/linux/amd64/17.1/systemd
* You can set the `GENTOO_PORTAGE_CLEANUP` environment variable to False to * You can set the `GENTOO_PORTAGE_CLEANUP` environment variable to False to
disable the clean up of portage repositories (including overlays). This disable the clean up of portage repositories (including overlays). This

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

@ -51,7 +51,7 @@ elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.1/hardened" ]]; then
elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.1/no-multilib/hardened" ]]; then elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.1/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'
elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/systemd" ]]; then elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.1/systemd" ]]; then
FILENAME_BASE='gentoo-stage4-systemd' FILENAME_BASE='gentoo-stage4-systemd'
SIGNED_SOURCE_SUFFIX='systemd' SIGNED_SOURCE_SUFFIX='systemd'
else else
@ -60,7 +60,7 @@ else
echo 'default/linux/amd64/17.1/no-multilib' echo 'default/linux/amd64/17.1/no-multilib'
echo 'default/linux/amd64/17.1/hardened' echo 'default/linux/amd64/17.1/hardened'
echo 'default/linux/amd64/17.1/no-multilib/hardened' echo 'default/linux/amd64/17.1/no-multilib/hardened'
echo 'default/linux/amd64/17.0/systemd' echo 'default/linux/amd64/17.1/systemd'
exit 1 exit 1
fi fi