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

The first argument is not used (anymore).

Changed files
+20 -22
nixos
+20 -22
nixos/modules/tasks/network-interfaces-systemd.nix
···
)
);
-
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: {
···
# former, the user retains full control over the configuration.
boot.initrd.systemd.network = mkMerge [
defaultGateways
-
(genericDhcpNetworks true)
+
genericDhcpNetworks
interfaceNetworks
bridgeNetworks
vlanNetworks
···
enable = true;
}
defaultGateways
-
(genericDhcpNetworks false)
+
genericDhcpNetworks
interfaceNetworks
bridgeNetworks
(mkMerge (