Fix networking for leap (#520)

kairos-io · Oct 24, 2023 · 2b01f37 · 2b01f37
1 parent 1a5a574
commit 2b01f37
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git 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
@@ -1,13 +1,7 @@
 name: "Default network configuration"
 stages:
-  initramfs:
-    - name: "Disable NetworkManager and wicked"
-      if: '[ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ]'
-      systemctl:
-        disable:
-          - NetworkManager
-          - wicked
-    - name: "Enable systemd-network and systemd-resolved"
+  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
@@ -16,9 +10,27 @@ stages:
           group: 0
           content: |
             [Match]
-            Name=en* eth*
+            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" ]'
+      systemctl:
+        disable:
+          - NetworkManager
+          - wicked
+    - name: "Enable systemd-network and systemd-resolved"
+      if: '[ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ]'
       systemctl:
         enable:
           - systemd-networkd