summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-09-11 08:13:04 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2016-09-11 08:13:04 +0200
commitc58654e2b78e7d3ae97ba96c80ceb3f96236e463 (patch)
treedf1bc2cf89d9661da6b102ea94328bad0a5734c9 /nixos/modules/system
parent3d479813f5919b6f87fac714d547cf1d1541bb8a (diff)
downloadnixlib-c58654e2b78e7d3ae97ba96c80ceb3f96236e463.tar
nixlib-c58654e2b78e7d3ae97ba96c80ceb3f96236e463.tar.gz
nixlib-c58654e2b78e7d3ae97ba96c80ceb3f96236e463.tar.bz2
nixlib-c58654e2b78e7d3ae97ba96c80ceb3f96236e463.tar.lz
nixlib-c58654e2b78e7d3ae97ba96c80ceb3f96236e463.tar.xz
nixlib-c58654e2b78e7d3ae97ba96c80ceb3f96236e463.tar.zst
nixlib-c58654e2b78e7d3ae97ba96c80ceb3f96236e463.zip
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/system')
-rw-r--r--nixos/modules/system/boot/systemd.nix2
1 files changed, 0 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 3fa257f96685..397e9a4987b7 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -727,8 +727,6 @@ in
         unitConfig.X-StopOnReconfiguration = true;
       };
 
-    systemd.targets.network-online.after = [ "ip-up.target" ];
-
     systemd.units =
       mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
       // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services