diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml index db09337d2..82ce61558 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.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 index 46bfcddb4..b57864b2a 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,8 +1,13 @@ 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 @@ -10,19 +15,22 @@ stages: 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: