Update coreos-cloudinit to latest main branch

This change updates coreos-cloudinit to the latest flatcar-master commit. This change disables user-configdrive.service on OpenStack, as coreos-cloudinit.service already runs on OpenStack when the system is not configured via ignition. Signed-off-by: Gabriel Adrian Samfira <[email protected]>
flatcar · Mar 25, 2024 · b19c376 · b19c376
1 parent 6ebffa7
commit b19c376
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md b/changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md
@@ -0,0 +1 @@
+- Disable user-configdrive.service on OpenStack when config drive is used. The coreos-cloudinit.service unit already runs on OpenStack if the system is not configured via ignition. ([Flatcar#1385](https://github.com/flatcar/Flatcar/issues/1385))
diff --git a/.../src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/.../src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
@@ -12,7 +12,7 @@ inherit cros-workon systemd toolchain-funcs udev coreos-go
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 else
-	CROS_WORKON_COMMIT="a7bc5f0050ab3493807ec69977cda26b882b4aad" # flatcar-master
+	CROS_WORKON_COMMIT="f78b9f7b484497c610c8a159aa971234d384d215" # flatcar-master
 	KEYWORDS="amd64 arm64"
 fi
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Disable user-configdrive.service on OpenStack when config drive is used. The coreos-cloudinit.service unit already runs on OpenStack if the system is not configured via ignition. ([Flatcar#1385](https://github.com/flatcar/Flatcar/issues/1385))