From 900033bf74cfee672e8c41a08761f60837626e32 Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka.garcia@spectrocloud.com>
Date: Mon, 23 Oct 2023 12:46:13 +0200
Subject: [PATCH] Create network files before starting the network service for
 systemd (#509)

---
 packages/static/kairos-overlay-files/collection.yaml   |  2 +-
 .../files/etc/systemd/network/20-dhcp-legacy.network   |  4 ----
 .../files/etc/systemd/network/20-dhcp.network          |  4 ----
 .../files/system/oem/05_network.yaml                   | 10 ++++++++++
 4 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 packages/static/kairos-overlay-files/files/etc/systemd/network/20-dhcp-legacy.network
 delete mode 100644 packages/static/kairos-overlay-files/files/etc/systemd/network/20-dhcp.network

diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml
index ea8dda9..802336c 100644
--- a/packages/static/kairos-overlay-files/collection.yaml
+++ b/packages/static/kairos-overlay-files/collection.yaml
@@ -1,4 +1,4 @@
 packages:
   - name: "kairos-overlay-files"
     category: "static"
-    version: "1.1.7"
+    version: "1.1.8"
diff --git a/packages/static/kairos-overlay-files/files/etc/systemd/network/20-dhcp-legacy.network b/packages/static/kairos-overlay-files/files/etc/systemd/network/20-dhcp-legacy.network
deleted file mode 100644
index cba38ab..0000000
--- a/packages/static/kairos-overlay-files/files/etc/systemd/network/20-dhcp-legacy.network
+++ /dev/null
@@ -1,4 +0,0 @@
-[Match]
-Name=eth*
-[Network]
-DHCP=yes
\ No newline at end of file
diff --git a/packages/static/kairos-overlay-files/files/etc/systemd/network/20-dhcp.network b/packages/static/kairos-overlay-files/files/etc/systemd/network/20-dhcp.network
deleted file mode 100644
index d4d203a..0000000
--- a/packages/static/kairos-overlay-files/files/etc/systemd/network/20-dhcp.network
+++ /dev/null
@@ -1,4 +0,0 @@
-[Match]
-Name=en*
-[Network]
-DHCP=yes
\ No newline at end of file
diff --git a/packages/static/kairos-overlay-files/files/system/oem/05_network.yaml b/packages/static/kairos-overlay-files/files/system/oem/05_network.yaml
index 2093d10..6c23b00 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/05_network.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/05_network.yaml
@@ -9,6 +9,16 @@ stages:
           - wicked
     - name: "Enable systemd-network and systemd-resolved"
       if: '[ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ]'
+      files:
+        - path: /etc/systemd/network/20-dhcp.network
+          permissions: 0644
+          owner: 0
+          group: 0
+          content: |
+            [Match]
+            Name=en* eth*
+            [Network]
+            DHCP=yes
       systemctl:
         enable:
           - systemd-networkd