sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "enable systemd profile for Gentoo"

Browse source
This commit is contained in:
Zuul 2018-03-23 19:01:35 +00:00 committed by Gerrit Code Review
commit 9d751463f1
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
diskimage_builder/elements/gentoo/finalise.d/99-cleanup
View file

@ -55,3 +55,8 @@ if [[ -a /usr/sbin/grub2-install ]]; then
fi fi
unfix_shm unfix_shm
# systemd id
if [[ "${GENTOO_PROFILE}" == *"systemd"* ]]; then
cp /dev/null /etc/machine-id
fi

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

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