Merge pull request #2016 from daMupfel/disable-dhcp-rapid-commit-for-…

…cloudsigma changelog: disable DHCP RapidCommit for CloudSigma OEM
flatcar · Sep 10, 2024 · a89ecb7 · a89ecb7
2 parents 512bc23 + 557175b
commit a89ecb7
Show file tree

Hide file tree

Showing 3 changed files with 21 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 @@
+- CloudSigma: 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,23 @@ coreos:
     version-id: @@OEM_VERSION_ID@@
     home-url: https://www.cloudsigma.com/
     bug-report-url: https://issues.flatcar.org
+  units:
+    - name: 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 @@
		- CloudSigma: 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))