diff options
| author | Adam Stephens <adam@valkor.net> | 2024-02-11 14:28:31 -0500 |
|---|---|---|
| committer | Adam Stephens <adam@valkor.net> | 2024-02-12 16:26:30 -0500 |
| commit | cf68af8561b4624738f10158960ce2748fa75877 (patch) | |
| tree | 5ad4648a5aab06adba9fe622eed03f2b2bf9d75e /nixos/maintainers | |
| parent | bdc79efc2b1e1eb4503589e6c362ccc9e10e9298 (diff) | |
nixos/lxc/container: switch to networkd by default
Diffstat (limited to 'nixos/maintainers')
| -rw-r--r-- | nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix | 19 | ||||
| -rw-r--r-- | nixos/maintainers/scripts/lxd/lxd-container-image.nix | 20 |
2 files changed, 34 insertions, 5 deletions
diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix index ef00c6f86cbd..4698971de8ff 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix @@ -13,8 +13,23 @@ ./lxd.nix ]; - networking.useDHCP = false; - networking.interfaces.eth0.useDHCP = true; + networking = { + dhcpcd.enable = false; + useDHCP = false; + useHostResolvConf = 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-container-image.nix b/nixos/maintainers/scripts/lxd/lxd-container-image.nix index b77f9f5aabe0..3f330952d695 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image.nix @@ -25,7 +25,21 @@ fi ''; - # Network - networking.useDHCP = false; - networking.interfaces.eth0.useDHCP = true; + networking = { + dhcpcd.enable = false; + useDHCP = false; + useHostResolvConf = false; + }; + + systemd.network = { + enable = true; + networks."50-eth0" = { + matchConfig.Name = "eth0"; + networkConfig = { + DHCP = "ipv4"; + IPv6AcceptRA = true; + }; + linkConfig.RequiredForOnline = "routable"; + }; + }; } |