From 16a7e2a29436a12749d9f1b32836e6a0648158cd Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Fri, 17 Nov 2023 15:43:57 +0100 Subject: [PATCH 1/2] coreos-base/coreos-init: Make sshkeys.service more robust This pulls in https://github.com/flatcar/init/pull/112 to only run coreos-metadata-sshkeys@core.service when not masked and also retry on failure. --- changelog/bugfixes/2023-11-17-sshkeys-service.md | 1 + .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/bugfixes/2023-11-17-sshkeys-service.md diff --git a/changelog/bugfixes/2023-11-17-sshkeys-service.md b/changelog/bugfixes/2023-11-17-sshkeys-service.md new file mode 100644 index 0000000000..19e01a8014 --- /dev/null +++ b/changelog/bugfixes/2023-11-17-sshkeys-service.md @@ -0,0 +1 @@ +- Made `sshkeys.service` more robust to only run `coreos-metadata-sshkeys@core.service` when not masked and also retry on failure ([init#112](https://github.com/flatcar/init/pull/112)) 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 4893550770..fbc055c49b 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="58b5c3ca766b31ab3f5c88492941c74c575d99c2" # flatcar-master + CROS_WORKON_COMMIT="db7a12ed8b5cbfc3023b01af1ed2666c210ba78d" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From cf261147e9353e1eb6e03e4c39291102e9c4e3ed Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Fri, 17 Nov 2023 15:51:53 +0100 Subject: [PATCH 2/2] coreos-base/coreos-init: Bump ebuild revision after change --- ...oreos-init-0.0.1-r189.ebuild => coreos-init-0.0.1-r190.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r189.ebuild => coreos-init-0.0.1-r190.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r189.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r190.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r189.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r190.ebuild