movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-15 05:59:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #288123 from adamcstephens/incus/networkd

Browse source 
nixos/lxc: fix VM network and switch container to networkd
This commit is contained in:
Adam C. Stephens 2024-02-13 00:30:26 -05:00 • committed by GitHub
commit fccf3732ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 40 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix
View file

@ -13,8 +13,23 @@
./lxd.nix ./lxd.nix
]; ];
networking.useDHCP = false; networking = {
networking.interfaces.eth0.useDHCP = true; 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? system.stateVersion = "@stateVersion@"; # Did you read the comment?
} }

20
nixos/maintainers/scripts/lxd/lxd-container-image.nix
View file

@ -25,7 +25,21 @@
fi fi
''; '';
# Network networking = {
networking.useDHCP = false; dhcpcd.enable = false;
networking.interfaces.eth0.useDHCP = true; useDHCP = false;
useHostResolvConf = false;
};
systemd.network = {
enable = true;
networks."50-eth0" = {
matchConfig.Name = "eth0";
networkConfig = {
DHCP = "ipv4";
IPv6AcceptRA = true;
};
linkConfig.RequiredForOnline = "routable";
};
};
} }

7
nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix
View file

@ -14,14 +14,15 @@
]; ];
networking = { networking = {
dhcdpcd.enable = false; dhcpcd.enable = false;
useDHCP = false; useDHCP = false;
useHostResolvConf = false;
}; };
systemd.network = { systemd.network = {
enable = true; enable = true;
networks."50-eth0" = { networks."50-enp5s0" = {
matchConfig.Name = "eth0"; matchConfig.Name = "enp5s0";
networkConfig = { networkConfig = {
DHCP = "ipv4"; DHCP = "ipv4";
IPv6AcceptRA = true; IPv6AcceptRA = true;

3
nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix
View file

@ -27,8 +27,9 @@
# Network # Network
networking = { networking = {
dhcdpcd.enable = false; dhcpcd.enable = false;
useDHCP = false; useDHCP = false;
useHostResolvConf = false;
}; };
systemd.network = { systemd.network = {