diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-08-30 08:00:10 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-08-30 08:05:00 -0700 |
| commit | 4d8390be608ed047ef99d96b0a3f58516bad4419 (patch) | |
| tree | c3a261ae4f95d769b77623518594482f4cfd63c7 /nixos/modules/services/networking/dhcpcd.nix | |
| parent | 86c0f8c549c2ad728e06f8bc11d805fe760e7df8 (diff) | |
nixos/network-interfaces: Support the old ip configuration convention
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 65b4319b50ab..7e0b00a3d7b5 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 != [ ]) (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)) |