Really, really fix the network issue (#521)

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

Hide file tree

Showing 2 changed files with 15 additions and 7 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.9"
+    version: "1.1.10"
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,28 +1,36 @@
 name: "Default network configuration"
 stages:
-  initramfs.before:
-    - name: "Enable systemd-network config files for DHCP"
+  rootfs:
+    - name: "Enable systemd-network config files for DHCP" # Needed if systemd-networkd runs in the initramfs!
       if: '[ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ]'
+      directories:
+        - path: "/etc/systemd/network/" # doesnt exist on initramfs
+          permissions: 0775
+          owner: 0
+          group: 0
       files:
         - path: /etc/systemd/network/20-dhcp.network
           permissions: 0644
           owner: 0
           group: 0
           content: |
             [Match]
-            Name=en*
+            Name=en* eth*
             [Network]
             DHCP=yes
-        - path: /etc/systemd/network/20-dhcp-legacy.network
+  initramfs:
+    - 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=eth*
+            Name=en* 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: