b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #165474 from jian-lin/fix-wireguard-systemd-unit-dependency

Browse source 
nixos/wireguard: fix dependencies on network-related targets
This commit is contained in:
Lassulus 2022-05-18 11:16:25 +02:00 committed by GitHub
parent b3e36242b1 0c795a8127
commit a976121d57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/services/networking/wireguard.nix
View file

@ -301,8 +301,9 @@ let
{ {
description = "WireGuard Peer - ${interfaceName} - ${peer.publicKey}"; description = "WireGuard Peer - ${interfaceName} - ${peer.publicKey}";
requires = [ "wireguard-${interfaceName}.service" ]; requires = [ "wireguard-${interfaceName}.service" ];
after = [ "wireguard-${interfaceName}.service" ]; wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" "wireguard-${interfaceName}.service" ]; after = [ "wireguard-${interfaceName}.service" "network-online.target" ];
wantedBy = [ "wireguard-${interfaceName}.service" ];
environment.DEVICE = interfaceName; environment.DEVICE = interfaceName;
environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity"; environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity";
path = with pkgs; [ iproute2 wireguard-tools ]; path = with pkgs; [ iproute2 wireguard-tools ];
@ -379,8 +380,9 @@ let
nameValuePair "wireguard-${name}" nameValuePair "wireguard-${name}"
{ {
description = "WireGuard Tunnel - ${name}"; description = "WireGuard Tunnel - ${name}";
requires = [ "network-online.target" ]; after = [ "network-pre.target" ];
after = [ "network.target" "network-online.target" ]; wants = [ "network.target" ];
before = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment.DEVICE = name; environment.DEVICE = name;
path = with pkgs; [ kmod iproute2 wireguard-tools ]; path = with pkgs; [ kmod iproute2 wireguard-tools ];