changelog: disable DHCP RapidCommit for CloudSigma OEM

flatcar · Jun 19, 2024 · 9d55d20 · 9d55d20
1 parent 53bc4e9
commit 9d55d20
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/changelog/bugfixes/2024-05-31-disable-dhcp-rapid-commit-for-cloudsigma.md b/changelog/bugfixes/2024-05-31-disable-dhcp-rapid-commit-for-cloudsigma.md
@@ -0,0 +1 @@
+- Disabled the new DHCP RapidCommit feature which is enabled by default since systemd 255. CloudSigma provides an incompatible implementation which results in cloud-init not being applied as no IP is issued. See: ([flatcar/scripts#2016](https://github.com/flatcar/scripts/pull/2016))
diff --git a/...ontainer/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml b/...ontainer/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml
@@ -7,3 +7,24 @@ coreos:
     version-id: @@OEM_VERSION_ID@@
     home-url: https://www.cloudsigma.com/
     bug-report-url: https://issues.flatcar.org
+
+write_files:
+  - path: /etc/systemd/network/za-dhcp-no-rapid-commit.network
+    content: |
+      [Network]
+      DHCP=yes
+      KeepConfiguration=dhcp-on-stop
+      IPv6AcceptRA=true
+
+      [Match]
+      Name=*
+      Type=!loopback bridge tunnel vxlan wireguard
+      Driver=!veth dummy
+
+      [DHCP]
+      UseMTU=true
+      UseDomains=true
+
+      [DHCPv4]
+      RoutesToDNS=false
+      RapidCommit=false
diff --git a/...cloudsigma/oem-cloudsigma-0.0.3-r5.ebuild → ...cloudsigma/oem-cloudsigma-0.0.3-r6.ebuild b/...cloudsigma/oem-cloudsigma-0.0.3-r5.ebuild → ...cloudsigma/oem-cloudsigma-0.0.3-r6.ebuild
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Disabled the new DHCP RapidCommit feature which is enabled by default since systemd 255. CloudSigma provides an incompatible implementation which results in cloud-init not being applied as no IP is issued. See: ([flatcar/scripts#2016](https://github.com/flatcar/scripts/pull/2016))