diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-04-30 06:44:25 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-04-30 06:49:10 +0200 |
commit | 4cdb4a4fef93b54dd41aab93d333c703df4d5803 (patch) | |
tree | e6845a955d501cfaf197e870bf9593b2923a468c /nixos/modules/system/boot/networkd.nix | |
parent | 49fa00cded7bd3da0aa76cd2eb58e197084b820d (diff) | |
download | nixpkgs-4cdb4a4fef93b54dd41aab93d333c703df4d5803.tar nixpkgs-4cdb4a4fef93b54dd41aab93d333c703df4d5803.tar.gz nixpkgs-4cdb4a4fef93b54dd41aab93d333c703df4d5803.tar.bz2 nixpkgs-4cdb4a4fef93b54dd41aab93d333c703df4d5803.tar.lz nixpkgs-4cdb4a4fef93b54dd41aab93d333c703df4d5803.tar.xz nixpkgs-4cdb4a4fef93b54dd41aab93d333c703df4d5803.tar.zst nixpkgs-4cdb4a4fef93b54dd41aab93d333c703df4d5803.zip |
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/modules/system/boot/networkd.nix')
-rw-r--r-- | nixos/modules/system/boot/networkd.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index e83aa6e2e2d..b183c0f3236 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 + |