nixos/network-interfaces-systemd: remove unused arg in genericDhcpNetworks
The first argument is not used (anymore).
This commit is contained in:
@@ -53,28 +53,26 @@ let
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
genericDhcpNetworks =
|
genericDhcpNetworks = mkIf cfg.useDHCP {
|
||||||
initrd:
|
networks."99-ethernet-default-dhcp" = {
|
||||||
mkIf cfg.useDHCP {
|
matchConfig = {
|
||||||
networks."99-ethernet-default-dhcp" = {
|
Type = "ether";
|
||||||
matchConfig = {
|
Kind = "!*"; # physical interfaces have no kind
|
||||||
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;
|
|
||||||
};
|
};
|
||||||
|
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 (
|
interfaceNetworks = mkMerge (
|
||||||
forEach interfaces (i: {
|
forEach interfaces (i: {
|
||||||
@@ -220,7 +218,7 @@ in
|
|||||||
# former, the user retains full control over the configuration.
|
# former, the user retains full control over the configuration.
|
||||||
boot.initrd.systemd.network = mkMerge [
|
boot.initrd.systemd.network = mkMerge [
|
||||||
defaultGateways
|
defaultGateways
|
||||||
(genericDhcpNetworks true)
|
genericDhcpNetworks
|
||||||
interfaceNetworks
|
interfaceNetworks
|
||||||
bridgeNetworks
|
bridgeNetworks
|
||||||
vlanNetworks
|
vlanNetworks
|
||||||
@@ -271,7 +269,7 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
}
|
}
|
||||||
defaultGateways
|
defaultGateways
|
||||||
(genericDhcpNetworks false)
|
genericDhcpNetworks
|
||||||
interfaceNetworks
|
interfaceNetworks
|
||||||
bridgeNetworks
|
bridgeNetworks
|
||||||
(mkMerge (
|
(mkMerge (
|
||||||
|
|||||||
Reference in New Issue
Block a user