From bc3aadb1bd7a46c70796f75c5de10f1fe9f895f5 Mon Sep 17 00:00:00 2001 From: David Eichin Date: Tue, 10 Sep 2024 07:17:58 +0200 Subject: [PATCH 1/2] changelog: add entry --- .../2024-05-31-disable-dhcp-rapid-commit-for-cloudsigma.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/bugfixes/2024-05-31-disable-dhcp-rapid-commit-for-cloudsigma.md 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 new file mode 100644 index 00000000000..71f6a2387f7 --- /dev/null +++ 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)) \ No newline at end of file From 557175b3df4ba59a07ed40708e8c964ea996c101 Mon Sep 17 00:00:00 2001 From: David Eichin Date: Tue, 10 Sep 2024 07:18:52 +0200 Subject: [PATCH 2/2] disable DHCP rapidcommit for cloudsigma --- .../oem-cloudsigma/files/cloud-config.yml | 20 +++++++++++++++++++ ....ebuild => oem-cloudsigma-0.0.3-r6.ebuild} | 0 2 files changed, 20 insertions(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/{oem-cloudsigma-0.0.3-r5.ebuild => oem-cloudsigma-0.0.3-r6.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml index f799bf4b4c0..176b17d1b11 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml +++ b/sdk_container/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 \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r6.ebuild