diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-11-20 02:37:48 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-11-26 11:22:02 -0800 |
| commit | 59f512ef7d2137586330f2cabffc41a70f4f0346 (patch) | |
| tree | 9b22c0e17aa84e71f774d6edcba55d0b7c412e81 /nixos/modules/services/networking/dhcpcd.nix | |
| parent | 045132a9b096a22cb6f84210fcd5223b9a770d62 (diff) | |
| download | nixpkgs-59f512ef7d2137586330f2cabffc41a70f4f0346.tar nixpkgs-59f512ef7d2137586330f2cabffc41a70f4f0346.tar.gz nixpkgs-59f512ef7d2137586330f2cabffc41a70f4f0346.tar.bz2 nixpkgs-59f512ef7d2137586330f2cabffc41a70f4f0346.tar.lz nixpkgs-59f512ef7d2137586330f2cabffc41a70f4f0346.tar.xz nixpkgs-59f512ef7d2137586330f2cabffc41a70f4f0346.tar.zst nixpkgs-59f512ef7d2137586330f2cabffc41a70f4f0346.zip | |
nixos/network-interfaces: Provide a networkd implementation
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 15dbf80a987..d70008e7c23 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: if i.useDHCP != null then i.useDHCP else 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)) |