From d2c4dcd16cd0230f57935f6bb2861ff722c63633 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 27 Jun 2023 11:47:25 +0200 Subject: [PATCH] coreos-base/coreos-init: Work around bash regression and handle dd error This pulls in https://github.com/flatcar/init/pull/97 and https://github.com/flatcar/init/pull/99 to work around a bash regression and add handling for disk write errors. --- changelog/bugfixes/2023-06-26-flatcar-install.md | 1 + ...eos-init-0.0.1-r179.ebuild => coreos-init-0.0.1-r180.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/bugfixes/2023-06-26-flatcar-install.md rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r179.ebuild => coreos-init-0.0.1-r180.ebuild} (100%) diff --git a/changelog/bugfixes/2023-06-26-flatcar-install.md b/changelog/bugfixes/2023-06-26-flatcar-install.md new file mode 100644 index 0000000000..a488a9ba52 --- /dev/null +++ b/changelog/bugfixes/2023-06-26-flatcar-install.md @@ -0,0 +1 @@ +- Worked around a bash regression in `flatcar-install` and added error reporting for disk write failures [Flatcar#1059](https://github.com/flatcar/Flatcar/issues/1059) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r179.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r180.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r179.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r180.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index 78afc1b446..ec21b7c466 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-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="17224c8d6f71b17676bbcf34919072fb67a6bf4c" # flatcar-master + CROS_WORKON_COMMIT="5b3ef3ad0febec168137670b9243e8d220c90c7e" # flatcar-3602-backport KEYWORDS="amd64 arm arm64 x86" fi