From 2b605e96c289b5f43fc31f3c177d6622a2767142 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 4 Sep 2019 16:20:19 +0200 Subject: [PATCH] nixos/networkd: continue supporting 99-main with wildcard interface match With systemd version 243 network units with empty match block will generate warnigs. The reasoning seems to be that the intended behaviour is hard to infere. Being explicit about really meaning any interface is the reasonable thing here. We want to get rid of this mechanism in the long run but as long as we do not have a replacement we should stick with it and keep it in reasonable good shape. --- nixos/modules/tasks/network-interfaces-systemd.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index f5a593211ef..34e27066715 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -72,7 +72,15 @@ in }; in mkMerge [ { enable = true; - networks."99-main" = genericNetwork mkDefault; + networks."99-main" = (genericNetwork mkDefault) // { + # We keep the "broken" behaviour of applying this to all interfaces. + # In general we want to get rid of this workaround but there hasn't + # been any work on that. + # See the following issues for details: + # - https://github.com/NixOS/nixpkgs/issues/18962 + # - https://github.com/NixOS/nixpkgs/issues/61629 + matchConfig = mkDefault { Name = "*"; }; + }; } (mkMerge (forEach interfaces (i: { netdevs = mkIf i.virtual ({