From 2bab5bb27c647908d12402edc1805f4ab890b008 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Fri, 17 Nov 2023 15:43:57 +0100 Subject: [PATCH] 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 c2550e972f..f19a8f6d96 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="77ffa7f82b8540d008f47096c74427639b1c1c72" # flatcar-3745-backport + CROS_WORKON_COMMIT="8c9cbf947a0dc646c7fdc282e88f527fd6c2adb6" # flatcar-3745-backport KEYWORDS="amd64 arm arm64 x86" fi