diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2014-08-31 10:58:54 +0200 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2014-08-31 10:58:54 +0200 |
| commit | ea8910652fcecbcd4f21aa1c66b1a0a239408b04 (patch) | |
| tree | 539cd8cdd81d4edad720d7d4de6f927d82f5107c /nixos/modules/services/networking/dhcpcd.nix | |
| parent | 2f697bf6931b24cdd428e22effbf6427a85afd42 (diff) | |
| download | nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.gz nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.bz2 nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.lz nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.xz nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.zst nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.zip | |
Revert "Merge pull request #3182 from wkennington/master.ipv6"
This reverts commit b23fd6585481a42937e105d5fce630a549900e86, reversing changes made to 43654cba2c280ce17b81db44993d1c1bcae3a9c6.
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 7e0b00a3d7b..89aa9bdb6b6 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.ip4 != [ ] || i.ipAddress != null) (attrValues config.networking.interfaces)) + map (i: i.name) (filter (i: 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)) |