From 2fe32a64587261acf085ba1d84d120480acb09c4 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Fri, 10 Oct 2025 17:21:31 +0900 Subject: [PATCH 1/2] coreos-base/update_engine: Fix keeping of needed Flatcar extensions Pulls in https://github.com/flatcar/update_engine/pull/51 Signed-off-by: Kai Lueke --- changelog/bugfixes/2025-10-10-flatcar-extensions.md | 1 + .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/bugfixes/2025-10-10-flatcar-extensions.md diff --git a/changelog/bugfixes/2025-10-10-flatcar-extensions.md b/changelog/bugfixes/2025-10-10-flatcar-extensions.md new file mode 100644 index 00000000000..afd3e3d42f5 --- /dev/null +++ b/changelog/bugfixes/2025-10-10-flatcar-extensions.md @@ -0,0 +1 @@ +- Fixed that the needed Flatcar extensions don't get removed on update which caused a re-download ([update_engine#51](https://github.com/flatcar/update_engine/pull/51)) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index 80eb8ec9635..1e90b9c3bd4 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -7,7 +7,7 @@ EGIT_REPO_URI="https://github.com/flatcar/update_engine.git" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - EGIT_COMMIT="aa31b3ea36b2c4d585406ab13dbdf2c4e8959a99" # main + EGIT_COMMIT="85eea2c932a0028b90d4db2f3d495ecf73f9342a" # main KEYWORDS="amd64 arm64" fi From 7e37477a85cb35413e5810241c91204e33b1436e Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Mon, 13 Oct 2025 18:21:42 +0900 Subject: [PATCH 2/2] coreos-base/update_engine: Fix opaque directory handling When /etc way kept busy through, e.g., a process using it as CWD, then even in the temporary namespace unmounting failed unless it was done with the lazy option. This pulls in https://github.com/flatcar/update_engine/pull/52 to address this. Signed-off-by: Kai Lueke --- .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index 1e90b9c3bd4..126f5cd4f7a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -7,7 +7,7 @@ EGIT_REPO_URI="https://github.com/flatcar/update_engine.git" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - EGIT_COMMIT="85eea2c932a0028b90d4db2f3d495ecf73f9342a" # main + EGIT_COMMIT="3a44be455f7c6978e99f9e3d4f01401d80301c40" # main KEYWORDS="amd64 arm64" fi