cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #259619 from Majiir/fix-networkd-dhcp

Browse source 
nixos/network-interfaces-systemd: fix DHCP setting
This commit is contained in:
Maximilian Bosch 2023-10-14 20:47:36 +02:00 committed by GitHub
commit 632cfff257
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/tasks/network-interfaces-systemd.nix
View file

@ -89,7 +89,7 @@ let
networks."40-${i.name}" = mkMerge [ (genericNetwork id) { networks."40-${i.name}" = mkMerge [ (genericNetwork id) {
name = mkDefault i.name; name = mkDefault i.name;
DHCP = mkForce (dhcpStr DHCP = mkForce (dhcpStr
(if i.useDHCP != null then i.useDHCP else false)); (if i.useDHCP != null then i.useDHCP else (config.networking.useDHCP && i.ipv4.addresses == [ ])));
address = forEach (interfaceIps i) address = forEach (interfaceIps i)
(ip: "${ip.address}/${toString ip.prefixLength}"); (ip: "${ip.address}/${toString ip.prefixLength}");
routes = forEach (interfaceRoutes i) routes = forEach (interfaceRoutes i)

16
nixos/modules/tasks/network-interfaces.nix
View file

@ -190,9 +190,11 @@ let
type = types.nullOr types.bool; type = types.nullOr types.bool;
default = null; default = null;
description = lib.mdDoc '' description = lib.mdDoc ''
Whether this interface should be configured with dhcp. Whether this interface should be configured with DHCP. Overrides the
Null implies the old behavior which depends on whether ip addresses default set by {option}`networking.useDHCP`. If `null` (the default),
are specified or not. DHCP is enabled if the interface has no IPv4 addresses configured
with {option}`networking.interfaces.<name>.ipv4.addresses`, and
disabled otherwise.
''; '';
}; };
@ -640,9 +642,7 @@ in
} ]; } ];
}; };
description = lib.mdDoc '' description = lib.mdDoc ''
The configuration for each network interface. If The configuration for each network interface.
{option}`networking.useDHCP` is true, then every
interface not listed here will be configured using DHCP.
Please note that {option}`systemd.network.netdevs` has more features Please note that {option}`systemd.network.netdevs` has more features
and is better maintained. When building new things, it is advised to and is better maintained. When building new things, it is advised to
@ -1304,8 +1304,8 @@ in
default = true; default = true;
description = lib.mdDoc '' description = lib.mdDoc ''
Whether to use DHCP to obtain an IP address and other Whether to use DHCP to obtain an IP address and other
configuration for all network interfaces that are not manually configuration for all network interfaces that do not have any manually
configured. configured IPv4 addresses.
''; '';
}; };

6
nixos/tests/networking.nix
View file

@ -185,7 +185,11 @@ let
nodes.router = router; nodes.router = router;
nodes.client = { lib, ... }: { nodes.client = { lib, ... }: {
# Disable test driver default config # Disable test driver default config
networking.interfaces = lib.mkForce {}; networking.interfaces = lib.mkForce {
# Make sure DHCP defaults correctly even when some unrelated config
# is set on the interface (nothing, in this case).
enp1s0 = {};
};
networking.useNetworkd = networkd; networking.useNetworkd = networkd;
virtualisation.interfaces.enp1s0.vlan = 1; virtualisation.interfaces.enp1s0.vlan = 1;
}; };