From f9091c0b0cee5c997af0196d76ce21c84af6d5c8 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 18 Jun 2024 09:07:40 +0000 Subject: [PATCH] netns: ensure that network.target depends on network-pre.target (why doesnt it by default?) this should fix that servo tries to start wg-ovpns before the netns is configured --- modules/netns.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/netns.nix b/modules/netns.nix index 8145c544..61c9c95f 100644 --- a/modules/netns.nix +++ b/modules/netns.nix @@ -90,6 +90,8 @@ let # ordered ambiguously w.r.t. network-local-commands (a dep of "network.target"). systemd.services.network-local-commands.wantedBy = [ "network-pre.target" ]; systemd.services.network-local-commands.before = [ "network-pre.target" ]; + systemd.targets.network-pre.wantedBy = [ "network.target" ]; + systemd.targets.network-pre.before = [ "network.target" ]; # create a new routing table that we can use to proxy traffic out of the root namespace # through the wireguard namespaces, and to the WAN via VPN. @@ -115,6 +117,7 @@ in networking.iproute2.rttablesExtraConfig = f.networking.iproute2.rttablesExtraConfig; networking.iproute2.enable = f.networking.iproute2.enable; systemd.services.network-local-commands = f.systemd.services.network-local-commands; + systemd.targets.network-pre = f.systemd.targets.network-pre; }; in take (sane-lib.mkTypedMerge take configs); }