gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/network: remove 99-main.network

Browse Source 
Just maching all network interfaces caused many breakages, see #18962
and #71106.

We already don't support the global networking.useDHCP,
networking.defaultGateway(6) options if networking.useNetworkd is
enabled, but direct users to configure the per-device
networking.interfaces.<name?>.… options.
This commit is contained in:
Florian Klink
2019-10-22 23:43:28 +02:00
parent 78b799ac2a
commit c3098d182d
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/tasks/network-interfaces-systemd.nix
View File

@@ -76,15 +76,6 @@ in
};
in mkMerge [ {
enable = true;
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 ({