From 2b01f37a5e0745315b8193c86a6aef01030cd633 Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka.garcia@spectrocloud.com>
Date: Tue, 24 Oct 2023 11:14:36 +0200
Subject: [PATCH] Fix networking for leap (#520)

---
 .../kairos-overlay-files/collection.yaml      |  2 +-
 .../files/system/oem/05_network.yaml          | 32 +++++++++++++------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml
index 802336c..db09337 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.8"
+    version: "1.1.9"
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 6c23b00..46bfcdd 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
@@ -1,5 +1,27 @@
 name: "Default network configuration"
 stages:
+  initramfs.before:
+    - name: "Enable systemd-network config files for DHCP"
+      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*
+            [Network]
+            DHCP=yes
+        - path: /etc/systemd/network/20-dhcp-legacy.network
+          permissions: 0644
+          owner: 0
+          group: 0
+          content: |
+            [Match]
+            Name=eth*
+            [Network]
+            DHCP=yes
   initramfs:
     - name: "Disable NetworkManager and wicked"
       if: '[ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ]'
@@ -9,16 +31,6 @@ 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