From 15d6eacb1564c7c6467f9a50a91426000593dc33 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 22 Dec 2020 10:49:19 +0100 Subject: nixos/{networkd,dhcpcd}: remove udev-settle hack systemd-udev-settle is a terrible hack[1] and should never[2] ever[3] used, seriously it's very bad. It was used as a stop-gap solution for issue #39069, but thanks to PR #79532 it can be removed now. [1]: https://github.com/systemd/systemd/issues/7293#issuecomment-592941764 [2]: https://github.com/NixOS/nixpkgs/issues/73095 [3]: https://github.com/NixOS/nixpkgs/issues/107341 --- nixos/modules/services/networking/dhcpcd.nix | 3 +-- nixos/modules/system/boot/networkd.nix | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index d10bffd9147..31e4b6ad298 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -191,9 +191,8 @@ in { description = "DHCP Client"; wantedBy = [ "multi-user.target" ] ++ optional (!hasDefaultGatewaySet) "network-online.target"; - wants = [ "network.target" "systemd-udev-settle.service" ]; + wants = [ "network.target" ]; before = [ "network-online.target" ]; - after = [ "systemd-udev-settle.service" ]; restartTriggers = [ exitHook ]; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 3b01bc00baf..914d3e62eb4 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1553,9 +1553,6 @@ in wantedBy = [ "multi-user.target" ]; aliases = [ "dbus-org.freedesktop.network1.service" ]; restartTriggers = map (x: x.source) (attrValues unitFiles); - # prevent race condition with interface renaming (#39069) - requires = [ "systemd-udev-settle.service" ]; - after = [ "systemd-udev-settle.service" ]; }; systemd.services.systemd-networkd-wait-online = { -- cgit 1.4.1