mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-08 05:36:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2403 from flatcar/kai/initrd-rework

Browse Source 
Rework initrd usr mount to start Ignition/Afterburn from there
This commit is contained in:
Kai Lüke 2023-01-25 17:02:55 +01:00 committed by GitHub
commit 8fd199414a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults vendored
View File

@ -94,9 +94,8 @@ INSTALL_MASK="
/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="
/usr/bin/ignition
"
# Keep the default languages small.

5
sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild vendored
View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else
CROS_WORKON_COMMIT="d362a47d14612edb584f9d122cb883650a7bb6b8" # flatcar-master
CROS_WORKON_COMMIT="aa8a19eb8e555d75535632600a353ea4cb5576eb" # flatcar-master
KEYWORDS="amd64 arm arm64 x86"
fi
@ -31,6 +31,7 @@ src_install() {
# re-use existing filesystem permissions during initrd creation.
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/03flatcar-network/parse-ip-for-networkd.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-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/99setup-root/initrd-setup-root \
"${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
}