From abfaba837458f250ee925151114ee0926e0f12f5 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Mon, 9 Jan 2023 15:17:35 +0100 Subject: [PATCH] sys-kernel/bootengine: Always run initrd-setup-root This pulls in c8399e42bb9651c3c108f916f6645557ab41884b which is a backport of the relevant parts of https://github.com/flatcar/bootengine/pull/50 to fix https://github.com/flatcar/Flatcar/issues/944 --- .../changelog/bugfixes/2022-01-09-initrd-setup-root.md | 1 + .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-01-09-initrd-setup-root.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-01-09-initrd-setup-root.md b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-01-09-initrd-setup-root.md new file mode 100644 index 0000000000..cfda2d073c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-01-09-initrd-setup-root.md @@ -0,0 +1 @@ +- The rootfs setup in the initrd now runs systemd-tmpfiles on every boot, not only when Ignition runs, to fix a dbus failure due to missing files ([Flatcar#944](https://github.com/flatcar/Flatcar/issues/944)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index 2b82c452ab..a78ecc3e25 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="95bb406972f1846945e8e355ab98cafa570f273f" # flatcar-master + CROS_WORKON_COMMIT="bda2db88381eab5a572a50c0eaae747906a7005c" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi