summary refs log tree commit diff
path: root/nixos/modules/services/networking/tinc.nix
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2019-04-25 22:54:11 +0200
committerLinus Heckemann <git@sphalerite.org>2019-04-25 22:54:11 +0200
commitd4cd164082df917745d6b6ab2f0f2a1427e499de (patch)
tree439ce1a9b956c293d9192415c7d1999ff706c0d3 /nixos/modules/services/networking/tinc.nix
parentb3d9da5f0a3d2e967ce9a6f7b349150964a14493 (diff)
downloadnixpkgs-d4cd164082df917745d6b6ab2f0f2a1427e499de.tar
nixpkgs-d4cd164082df917745d6b6ab2f0f2a1427e499de.tar.gz
nixpkgs-d4cd164082df917745d6b6ab2f0f2a1427e499de.tar.bz2
nixpkgs-d4cd164082df917745d6b6ab2f0f2a1427e499de.tar.lz
nixpkgs-d4cd164082df917745d6b6ab2f0f2a1427e499de.tar.xz
nixpkgs-d4cd164082df917745d6b6ab2f0f2a1427e499de.tar.zst
nixpkgs-d4cd164082df917745d6b6ab2f0f2a1427e499de.zip
nixos/tinc: remove ordering dependency on network.target
This allows configuring IP addresses on a tinc interface using
networking.interfaces."tinc.${n}".ipv[46].addresses.

Previously, this would fail with timeouts, because of the dependency
chain
tinc.${netname}.service
--after--> network.target
--after--> network-addresses-tinc.${n}.service (and network-link-…)
--after--> sys-subsystem-net-devices-tinc.${n}.device

But the network interface doesn't exist until tinc creates it! So
systemd waits in vain for the interface to appear, and by then the
network-addresses-* and network-link-* units have failed. This leads
to the network link not being brought up and the network addresses not
being assigned, which in turn stops tinc from actually working.
Diffstat (limited to 'nixos/modules/services/networking/tinc.nix')
-rw-r--r--nixos/modules/services/networking/tinc.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 3379efd1afc..e98aafc2093 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -153,7 +153,6 @@ in
       ({
         description = "Tinc Daemon - ${network}";
         wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" ];
         path = [ data.package ];
         restartTriggers = [ config.environment.etc."tinc/${network}/tinc.conf".source ];
         serviceConfig = {