coreos-base/coreos-init: Make sshkeys.service more robust

This pulls in flatcar/init#112 to only run coreos-metadata-sshkeys@core.service when not masked and also retry on failure.
flatcar · Nov 17, 2023 · 16a7e2a · 16a7e2a
1 parent 79031fd
commit 16a7e2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog/bugfixes/2023-11-17-sshkeys-service.md 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
@@ -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