summary refs log tree commit diff
path: root/nixos/modules/services/networking/dhcpcd.nix
diff options
context:
space:
mode:
authorNetix (Espinet François) <dev.espinetfrancois@gmail.com>2018-12-29 11:16:51 +0100
committerNetix (Espinet François) <dev.espinetfrancois@gmail.com>2019-12-15 21:16:26 +0100
commitcd3597b4864935a8dc978b711a4847a6132b8a2c (patch)
tree2929b85e5b29fe4e2c4095b75a4b3ff22257b670 /nixos/modules/services/networking/dhcpcd.nix
parentaa4a1b01d5180f9ceee99b16dd007672aa3f2dee (diff)
downloadnixpkgs-cd3597b4864935a8dc978b711a4847a6132b8a2c.tar
nixpkgs-cd3597b4864935a8dc978b711a4847a6132b8a2c.tar.gz
nixpkgs-cd3597b4864935a8dc978b711a4847a6132b8a2c.tar.bz2
nixpkgs-cd3597b4864935a8dc978b711a4847a6132b8a2c.tar.lz
nixpkgs-cd3597b4864935a8dc978b711a4847a6132b8a2c.tar.xz
nixpkgs-cd3597b4864935a8dc978b711a4847a6132b8a2c.tar.zst
nixpkgs-cd3597b4864935a8dc978b711a4847a6132b8a2c.zip
openvswitch: better integration with systemd
Systemd dependencies for scripted mode
were refactored according to analysis in #34586.

networking.vswitches can now be used with systemd-networkd,
although they are not supported by the daemon, a nixos receipe
creates the switch and attached required interfaces (just like
the scripted version).

Vlans and internal interfaces are implemented following the
  template format i.e. each interface is
described using an attributeSet (vlan and type at the moment).
If vlan is present, then interface is added to the vswitch with
given tag (access mode). Type internal enabled vswitch to create
interfaces (see openvswitch docs).

Added configuration for configuring supported openFlow version on
the vswitch

This commit is a split from the original PR #35127.
Diffstat (limited to 'nixos/modules/services/networking/dhcpcd.nix')
-rw-r--r--nixos/modules/services/networking/dhcpcd.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 7b278603455..4b572df10b4 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;