Rework initrd usr mount to start Ignition/Afterburn from there

This pulls in
https://github.com/flatcar/bootengine/pull/52
to reduce the size of the unified kernel image by starting Ignition/
Afterburn from the /usr partition.
This also requires to install the Ignition binary to /usr.
This commit is contained in:
Kai Lueke 2023-01-16 13:16:55 +01:00
parent 829965f384
commit 5eedc5fa29
2 changed files with 5 additions and 3 deletions

View File

@ -89,9 +89,8 @@ INSTALL_MASK="
/usr/share/portage/config/repos.conf /usr/share/portage/config/repos.conf
" "
# Prevent 'ignition' binary from being installed from sys-apps/ignition binary package. # Prevent binaries from being installed to rootfs from binary packages
PKG_INSTALL_MASK=" PKG_INSTALL_MASK="
/usr/bin/ignition
" "
# Keep the default languages small. # Keep the default languages small.

View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else else
CROS_WORKON_COMMIT="d362a47d14612edb584f9d122cb883650a7bb6b8" # flatcar-master CROS_WORKON_COMMIT="aa8a19eb8e555d75535632600a353ea4cb5576eb" # flatcar-master
KEYWORDS="amd64 arm arm64 x86" KEYWORDS="amd64 arm arm64 x86"
fi fi
@ -31,6 +31,7 @@ src_install() {
# re-use existing filesystem permissions during initrd creation. # re-use existing filesystem permissions during initrd creation.
chmod +x "${D}"/usr/lib/dracut/modules.d/10*-generator/*-generator \ chmod +x "${D}"/usr/lib/dracut/modules.d/10*-generator/*-generator \
"${D}"/usr/lib/dracut/modules.d/10diskless-generator/diskless-btrfs \ "${D}"/usr/lib/dracut/modules.d/10diskless-generator/diskless-btrfs \
"${D}"/usr/lib/dracut/modules.d/03flatcar-network/parse-ip-for-networkd.sh \
"${D}"/usr/lib/dracut/modules.d/30disk-uuid/disk-uuid.sh \ "${D}"/usr/lib/dracut/modules.d/30disk-uuid/disk-uuid.sh \
"${D}"/usr/lib/dracut/modules.d/30ignition/ignition-generator \ "${D}"/usr/lib/dracut/modules.d/30ignition/ignition-generator \
"${D}"/usr/lib/dracut/modules.d/30ignition/ignition-setup.sh \ "${D}"/usr/lib/dracut/modules.d/30ignition/ignition-setup.sh \
@ -39,5 +40,7 @@ src_install() {
"${D}"/usr/lib/dracut/modules.d/35torcx/torcx-profile-populate-generator \ "${D}"/usr/lib/dracut/modules.d/35torcx/torcx-profile-populate-generator \
"${D}"/usr/lib/dracut/modules.d/99setup-root/initrd-setup-root \ "${D}"/usr/lib/dracut/modules.d/99setup-root/initrd-setup-root \
"${D}"/usr/lib/dracut/modules.d/99setup-root/initrd-setup-root-after-ignition \ "${D}"/usr/lib/dracut/modules.d/99setup-root/initrd-setup-root-after-ignition \
"${D}"/usr/lib/dracut/modules.d/30ignition/coreos-metadata-wrapper \
"${D}"/usr/lib/dracut/modules.d/30ignition/ignition-wrapper \
|| die chmod || die chmod
} }