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

Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6""

Browse Source 
This reverts commit ea8910652f.
This commit is contained in:
William A. Kennington III
2014-08-31 09:46:16 -07:00
parent 45c4e4d04a
commit 3d037ebb94
7 changed files with 120 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/networking/dhcpcd.nix
+1 -1
View File
@@ -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 != [ ] || i.ipAddress != null) (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))