diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-08-31 09:46:16 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-08-31 09:46:16 -0700 |
| commit | 3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb (patch) | |
| tree | 39f7a63253ae764835780f6305cf8bc5d8b109bc /nixos/modules/services/networking/dhcpcd.nix | |
| parent | 45c4e4d04adb79e21819d124b0156ac81ea3f760 (diff) | |
| download | nixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.tar nixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.tar.gz nixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.tar.bz2 nixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.tar.lz nixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.tar.xz nixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.tar.zst nixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.zip | |
Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6""
This reverts commit ea8910652fcecbcd4f21aa1c66b1a0a239408b04.
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 89aa9bdb6b6..7e0b00a3d7b 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)) |