diff options
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2003.xml | 16 | ||||
| -rw-r--r-- | nixos/modules/tasks/network-interfaces-systemd.nix | 9 |
2 files changed, 16 insertions, 9 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 33eba8002ba..d925f30ff22 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -99,6 +99,22 @@ reconfiguring <literal>hostsdir</literal>. </para> </listitem> + <listitem> + <para> + The <literal>99-main.network</literal> file was removed. Maching all + network interfaces caused many breakages, see + <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18962">#18962</link> + and <link xlink:href="https://github.com/NixOS/nixpkgs/pull/71106">#71106</link>. + </para> + <para> + We already don't support the global <link linkend="opt-networking.useDHCP">networking.useDHCP</link>, + <link linkend="opt-networking.defaultGateway">networking.defaultGateway</link> and + <link linkend="opt-networking.defaultGateway6">networking.defaultGateway6</link> options + if <link linkend="opt-networking.useNetworkd">networking.useNetworkd</link> is enabled, + but direct users to configure the per-device + <link linkend="opt-networking.interfaces">networking.interfaces.<name>.…</link> options. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 863072e33dc..90ee09c34dd 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -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 ({ |