diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-11 08:13:04 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-11 08:13:04 +0200 |
| commit | c58654e2b78e7d3ae97ba96c80ceb3f96236e463 (patch) | |
| tree | df1bc2cf89d9661da6b102ea94328bad0a5734c9 /nixos/modules/services/networking/dhcpcd.nix | |
| parent | 3d479813f5919b6f87fac714d547cf1d1541bb8a (diff) | |
treewide: fix fallout of ip-up deprecation
See #18319 for details. Starting network-online.target manually does not
work as it hangs indefinitely.
Additionally, don't treat avahi and dhcpcd special and sync their systemd units
with the respective upstream suggestion.
Diffstat (limited to 'nixos/modules/services/networking/dhcpcd.nix')
| -rw-r--r-- | nixos/modules/services/networking/dhcpcd.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 994b857e5e80..49d74dfdf0f0 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -147,10 +147,9 @@ in systemd.services.dhcpcd = { description = "DHCP Client"; - wantedBy = [ "network.target" ]; - # Work-around to deal with problems where the kernel would remove & - # re-create Wifi interfaces early during boot. - after = [ "network-interfaces.target" ]; + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + before = [ "network.target" ]; # Stopping dhcpcd during a reconfiguration is undesirable # because it brings down the network interfaces configured by |