From 26eeb97e814dfff14d000bab4ebd6016456d71b0 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Thu, 8 Feb 2024 18:51:39 +0100 Subject: [PATCH] coreos-base/update_engine: Support updating old airgapped clients This pulls in https://github.com/flatcar/update_engine/pull/38 with two workarounds to read out proxy env vars from the service unit and to read out the XML response from the journal logs, because the XML passing and the passing of proxy env vars is not present in old clients. --- changelog/bugfixes/2024-02-08-airgapped-updates.md | 1 + .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/bugfixes/2024-02-08-airgapped-updates.md diff --git a/changelog/bugfixes/2024-02-08-airgapped-updates.md b/changelog/bugfixes/2024-02-08-airgapped-updates.md new file mode 100644 index 0000000000..be418c9229 --- /dev/null +++ b/changelog/bugfixes/2024-02-08-airgapped-updates.md @@ -0,0 +1 @@ +- Added a workaround for old airgapped/proxied update-engine clients to be able to update to this release ([Flatcar#1332](https://github.com/flatcar/Flatcar/issues/1332), [update_engine#38](https://github.com/flatcar/update_engine/pull/38)) 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 73b0dfea96..34a6c14d9c 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 @@ -8,7 +8,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="014e5079163de0a4a17f416c4b4a89772ba295d2" # flatcar-3815-backport + CROS_WORKON_COMMIT="0a2e1bbd7564a237a15a0b3bf248f702b0d74e61" # flatcar-3815-backport KEYWORDS="amd64 arm64" fi