Really, really fix the network issue (#521)

This commit is contained in:
Itxaka
2023-10-24 18:43:32 +02:00
committed by GitHub
parent 2b01f37a5e
commit 362058eda5
2 changed files with 21 additions and 13 deletions

View File

@@ -1,4 +1,4 @@
packages: packages:
- name: "kairos-overlay-files" - name: "kairos-overlay-files"
category: "static" category: "static"
version: "1.1.9" version: "1.1.10"

View File

@@ -1,6 +1,24 @@
name: "Default network configuration" name: "Default network configuration"
stages: stages:
initramfs.before: 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* eth*
[Network]
DHCP=yes
initramfs:
- name: "Enable systemd-network config files for DHCP" - name: "Enable systemd-network config files for DHCP"
if: '[ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ]' if: '[ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ]'
files: files:
@@ -10,19 +28,9 @@ stages:
group: 0 group: 0
content: | content: |
[Match] [Match]
Name=en* Name=en* eth*
[Network] [Network]
DHCP=yes 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" - name: "Disable NetworkManager and wicked"
if: '[ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ]' if: '[ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ]'
systemctl: systemctl: