summaryrefslogtreecommitdiffstats
path: root/nixos/modules/services/networking/dhcpcd.nix
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2014-07-04 14:57:19 -0500
committerWilliam A. Kennington III <william@wkennington.com>2014-08-30 07:33:38 -0700
commit098c8f4c77b1ed9ea28b5aabadde24b17df8d568 (patch)
tree1b452d92b78e05704ade92059c4d4309b35471ae /nixos/modules/services/networking/dhcpcd.nix
parent4280305a41a8054d6669f0229cf1d88f2867c36e (diff)
nixos/network-interfaces: Add support for multiple ipv4 / ipv6 addresses
Diffstat (limited to 'nixos/modules/services/networking/dhcpcd.nix')
-rw-r--r--nixos/modules/services/networking/dhcpcd.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 89aa9bdb6b68..65b4319b50ab 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -11,7 +11,7 @@ let
# Don't start dhcpcd on explicitly configured interfaces or on
# interfaces that are part of a bridge, bond or sit device.
ignoredInterfaces =
- map (i: i.name) (filter (i: i.ipAddress != null) (attrValues config.networking.interfaces))
+ map (i: i.name) (filter (i: i.ip4 != [ ]) (attrValues config.networking.interfaces))
++ mapAttrsToList (i: _: i) config.networking.sits
++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))
++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds))