From 4cdb4a4fef93b54dd41aab93d333c703df4d5803 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 30 Apr 2015 06:44:25 +0200 Subject: networkd: Fix evaluation of systemd.network units. During the refactor of the networkd stuff in f8dbe5f, a lot of the options are now needed by systemd.nix as well as networkd.nix but weren't moved by that commit as well. For now, this fixes all networkd VM tests except for the macvlan one and thus it should fix #7505 for at least DHCP-based configuration. Signed-off-by: aszlig --- nixos/modules/system/boot/networkd.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'nixos/modules/system/boot/networkd.nix') diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index e83aa6e2e2d6..b183c0f32366 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -482,6 +482,11 @@ let }; }; + commonMatchText = def: '' + [Match] + ${attrsToSection def.matchConfig} + ''; + linkToUnit = name: def: { inherit (def) enable; text = commonMatchText def + -- cgit 1.4.1