diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-09-01 10:28:54 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-09-01 10:28:54 +0400 |
| commit | 9e3d1b1a8f1c2401e360183f96d55a0b27d72f00 (patch) | |
| tree | caa912ad334a1c6e711e14ea6e4429b7e27cbf34 /nixos/modules/services/networking/dhcpcd.nix | |
| parent | 26a4001a98322ab903b8186b97f33c5b282828a5 (diff) | |
| parent | 02ecc98e87dd35afe5a07299a9d0674ed1533ace (diff) | |
Merge pull request #3908 from wkennington/master.ip
Reapply the multi-ip code
Diffstat (limited to 'nixos/modules/services/networking/dhcpcd.nix')
| -rw-r--r-- | nixos/modules/services/networking/dhcpcd.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 09c271bfbfbb..084ac69e8d5d 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 != [ ] || 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)) |