From fd56d1736f5c54c4506eea949deb90ae9b766684 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Fri, 17 Mar 2023 21:51:03 +0900 Subject: [PATCH] sys-kernel/bootengine: Prevent OEM mount point from showing up early This pulls in https://github.com/flatcar/bootengine/pull/58 to prevent the OEM mount point from showing up before Ignition mounts. It also makes it simpler to write files to the OEM partition without having to specify the partition first as initrd mount point. Fixes https://github.com/flatcar/Flatcar/issues/979 --- .../changelog/bugfixes/2023-03-20-ignition-oem-partition.md | 1 + .../changelog/changes/2023-03-20-ignition-oem-files.md | 1 + .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2023-03-20-ignition-oem-partition.md create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/changes/2023-03-20-ignition-oem-files.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2023-03-20-ignition-oem-partition.md b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2023-03-20-ignition-oem-partition.md new file mode 100644 index 0000000000..e6cf04392d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2023-03-20-ignition-oem-partition.md @@ -0,0 +1 @@ +- Restored the support to specify OEM partition files in Ignition when `/usr/share/oem` is given as initrd mount point ([bootengine#58](https://github.com/flatcar/bootengine/pull/58)) diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/changes/2023-03-20-ignition-oem-files.md b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2023-03-20-ignition-oem-files.md new file mode 100644 index 0000000000..7d6471b475 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2023-03-20-ignition-oem-files.md @@ -0,0 +1 @@ +- Specifying the OEM filesystem in Ignition to write files to `/usr/share/oem` is not needed anymore ([bootengine#58](https://github.com/flatcar/bootengine/pull/58)) 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 55a025ff44..73643f795b 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="0ba568efbcbb4112b3adedadbf46b753f757fe36" # flatcar-master + CROS_WORKON_COMMIT="3ba6216024c75d502b9696d05f4f02594d52efbb" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi