diff options
author | rnhmjoj <rnhmjoj@inventati.org> | 2020-12-22 10:49:19 +0100 |
---|---|---|
committer | rnhmjoj <rnhmjoj@inventati.org> | 2021-02-18 22:07:00 +0100 |
commit | 15d6eacb1564c7c6467f9a50a91426000593dc33 (patch) | |
tree | 2462e9701794c01055fb74f4d7a2685c61ca78a2 /nixos | |
parent | bbe2fbe92914852cbffece4716f305eabe55f37b (diff) |
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
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/networking/dhcpcd.nix | 3 | ||||
-rw-r--r-- | nixos/modules/system/boot/networkd.nix | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index d10bffd914743..31e4b6ad2988c 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 3b01bc00bafa2..914d3e62eb423 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 = { |