From 7a2178c984eccf390647a33acf930c4e5de7630c 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 00000000000..be418c92291 --- /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 89e2ab0deee..48cb9e4a5c6 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="367f1fd96cdf9d7f7f281ca132d02813be123d01" # flatcar-master + CROS_WORKON_COMMIT="f627c4def9ff42cc6bf4b04cf211e11a42b34f31" # flatcar-master KEYWORDS="amd64 arm64" fi