diff options
| author | Maciej Krüger <mkg20001@gmail.com> | 2024-02-11 15:40:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-11 15:40:59 +0100 |
| commit | 7e2cabc5ea5ae772d838dfd185b25f78b63565c7 (patch) | |
| tree | d5c162b7cf38fee7b388f96d9ae8b04eed9676f9 | |
| parent | Merge pull request #285378 from OPNA2608/update/ayatana-indicator-datetime (diff) | |
| parent | nixos/lxd: use networkd for DHCP/RA (diff) | |
| download | nixpkgs-7e2cabc5ea5ae772d838dfd185b25f78b63565c7.tar.gz | |
Merge pull request #287270 from mweinelt/lxd-networkd
nixos/lxd: use networkd for DHCP/RA
| -rw-r--r-- | nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix | 18 | ||||
| -rw-r--r-- | nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix | 18 |
2 files changed, 32 insertions, 4 deletions
diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix index c1c50b32ff5b..2d1761401fcd 100644 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix @@ -13,8 +13,22 @@ ./lxd.nix ]; - networking.useDHCP = false; - networking.interfaces.eth0.useDHCP = true; + networking = { + dhcdpcd.enable = false; + useDHCP = false; + }; + + systemd.network = { + enable = true; + networks."50-eth0" = { + matchConfig.Name = "eth0"; + networkConfig = { + DHCP = "ipv4"; + IPv6AcceptRA = true; + }; + linkConfig.RequiredForOnline = "routable"; + }; + }; system.stateVersion = "@stateVersion@"; # Did you read the comment? } diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix index 0d96eea0e2d2..a58579914465 100644 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix @@ -26,6 +26,20 @@ ''; # Network - networking.useDHCP = false; - networking.interfaces.enp5s0.useDHCP = true; + networking = { + dhcdpcd.enable = false; + useDHCP = false; + }; + + systemd.network = { + enable = true; + networks."50-enp5s0" = { + matchConfig.Name = "enp5s0"; + networkConfig = { + DHCP = "ipv4"; + IPv6AcceptRA = true; + }; + linkConfig.RequiredForOnline = "routable"; + }; + }; } |