gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/network-interfaces-systemd: remove unused arg in genericDhcpNetworks

Browse Source 
The first argument is not used (anymore).
This commit is contained in:
Florian Klink
2025-01-26 14:47:59 +02:00
parent 1205aaa6bc
commit 0b65cf03f0
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
nixos/modules/tasks/network-interfaces-systemd.nix
View File

@@ -53,28 +53,26 @@ let
)
);
genericDhcpNetworks =
initrd:
mkIf cfg.useDHCP {
networks."99-ethernet-default-dhcp" = {
matchConfig = {
Type = "ether";
Kind = "!*"; # physical interfaces have no kind
};
DHCP = "yes";
networkConfig.IPv6PrivacyExtensions = "kernel";
};
networks."99-wireless-client-dhcp" = {
matchConfig.WLANInterfaceType = "station";
DHCP = "yes";
networkConfig.IPv6PrivacyExtensions = "kernel";
# We also set the route metric to one more than the default
# of 1024, so that Ethernet is preferred if both are
# available.
dhcpV4Config.RouteMetric = 1025;
ipv6AcceptRAConfig.RouteMetric = 1025;
genericDhcpNetworks = mkIf cfg.useDHCP {
networks."99-ethernet-default-dhcp" = {
matchConfig = {
Type = "ether";
Kind = "!*"; # physical interfaces have no kind
};
DHCP = "yes";
networkConfig.IPv6PrivacyExtensions = "kernel";
};
networks."99-wireless-client-dhcp" = {
matchConfig.WLANInterfaceType = "station";
DHCP = "yes";
networkConfig.IPv6PrivacyExtensions = "kernel";
# We also set the route metric to one more than the default
# of 1024, so that Ethernet is preferred if both are
# available.
dhcpV4Config.RouteMetric = 1025;
ipv6AcceptRAConfig.RouteMetric = 1025;
};
};
interfaceNetworks = mkMerge (
forEach interfaces (i: {
@@ -220,7 +218,7 @@ in
# former, the user retains full control over the configuration.
boot.initrd.systemd.network = mkMerge [
defaultGateways
(genericDhcpNetworks true)
genericDhcpNetworks
interfaceNetworks
bridgeNetworks
vlanNetworks
@@ -271,7 +269,7 @@ in
enable = true;
}
defaultGateways
(genericDhcpNetworks false)
genericDhcpNetworks
interfaceNetworks
bridgeNetworks
(mkMerge (