diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-02-21 08:24:49 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-21 08:24:49 +0000 |
commit | 1ddb140d95c6a1ab914f1d9f3d5169b12074c333 (patch) | |
tree | 64bf58d9759a0f96f6064fc237fdac4a32d3c294 /nixos/modules/services/networking/dhcpcd.nix | |
parent | c38529df78e402f945a8d51439b2c92d2a249d86 (diff) | |
parent | cd3597b4864935a8dc978b711a4847a6132b8a2c (diff) | |
download | nixpkgs-1ddb140d95c6a1ab914f1d9f3d5169b12074c333.tar nixpkgs-1ddb140d95c6a1ab914f1d9f3d5169b12074c333.tar.gz nixpkgs-1ddb140d95c6a1ab914f1d9f3d5169b12074c333.tar.bz2 nixpkgs-1ddb140d95c6a1ab914f1d9f3d5169b12074c333.tar.lz nixpkgs-1ddb140d95c6a1ab914f1d9f3d5169b12074c333.tar.xz nixpkgs-1ddb140d95c6a1ab914f1d9f3d5169b12074c333.tar.zst nixpkgs-1ddb140d95c6a1ab914f1d9f3d5169b12074c333.zip |
Merge pull request #53033 from netixx/openvswitch-improved-systemd
openvswitch: better integration with systemd
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 f476b147a57..c0619211c2f 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -19,7 +19,7 @@ let map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ipv4.addresses != [ ]) 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.vswitches)) + ++ flatten (concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues config.networking.vswitches)) ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds)) ++ config.networking.dhcpcd.denyInterfaces; |