From 30b1d0d5c4bf69801c7859e6074f40c5bff507ef Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Thu, 25 Jan 2024 12:56:47 +0100 Subject: [PATCH] Backport XML passing to LTS as jump version for airgapped environments Old versions didn't pass the Omaha XML response to the update-engine postinst action, thus triggering the fallback download which doesn't work for clients on a restricted network. Backport the XML passing to make it possible to use this LTS version as jump version because it doesn't require OEM payloads. --- changelog/changes/2024-01-25-support-oem-payloads.md | 1 + ...engine-0.4.10-r10.ebuild => update_engine-0.4.10-r11.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/changes/2024-01-25-support-oem-payloads.md rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.4.10-r10.ebuild => update_engine-0.4.10-r11.ebuild} (100%) diff --git a/changelog/changes/2024-01-25-support-oem-payloads.md b/changelog/changes/2024-01-25-support-oem-payloads.md new file mode 100644 index 0000000000..81e9b8241e --- /dev/null +++ b/changelog/changes/2024-01-25-support-oem-payloads.md @@ -0,0 +1 @@ +- Backported the OEM payload support to update-engine to avoid the fallback download path for clients on a restricted network and rather use the URLs passed from `flatcar-update -E` or with self-hosted Nebraska payloads ([Flatcar#1332](https://github.com/flatcar/Flatcar/issues/1332), [Flatcar#1326](https://github.com/flatcar/Flatcar/issues/1326)) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r10.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r11.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r10.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r11.ebuild 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 f47716d222..5e8b09cbde 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="2a1110633bd9b4fe1741a2c77e6ca4cac1f1828b" # flatcar-3510-backport + CROS_WORKON_COMMIT="ee47508c3f0d38724797198cda6c6705495d2758" # flatcar-3510-backport KEYWORDS="amd64 arm64" fi