gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
parent 8601deaed1 cf68af8561
commit fccf3732ef
4 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix
+17 -2
View File
@@ -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?
}
nixos/maintainers/scripts/lxd/lxd-container-image.nix
+17 -3
View File
@@ -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";
};
};
}
nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix
+4 -3
View File
@@ -14,14 +14,15 @@
];
networking = {
dhcdpcd.enable = false;
dhcpcd.enable = false;
useDHCP = false;
useHostResolvConf = false;
};
systemd.network = {
enable = true;
networks."50-eth0" = {
matchConfig.Name = "eth0";
networks."50-enp5s0" = {
matchConfig.Name = "enp5s0";
networkConfig = {
DHCP = "ipv4";
IPv6AcceptRA = true;
nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix
+2 -1
View File
@@ -27,8 +27,9 @@
# Network
networking = {
dhcdpcd.enable = false;
dhcpcd.enable = false;
useDHCP = false;
useHostResolvConf = false;
};
systemd.network = {