Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wireguard: change preStop to postStop, require network.target #45569

Merged
merged 2 commits into from Sep 2, 2018

Conversation

yorickvP
Copy link
Contributor

Motivation for this change

If the wireguard service fails, the teardown script is not executed and it cannot be restarted cleanly, because the device still exists. This changes preStop to postStop, in order to execute the teardown script in all cases.

Also, if the wireguard service has to do a dns resolve and there is no network available, the service fails to start. Add a 'network.target' requirement.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@globin
Copy link
Member

globin commented Aug 24, 2018

please see #45392

@@ -190,6 +190,7 @@ let
nameValuePair "wireguard-${name}"
{
description = "WireGuard Tunnel - ${name}";
requires = [ "network.target" ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

network-online.target tries gives you connectivity guarantees.

@xeji
Copy link
Contributor

xeji commented Sep 2, 2018

I am merging this first because I am not sure #45392 is ready yet, and we should get at least one of these improvements into 18.09.

@xeji xeji merged commit 1ee3ad6 into NixOS:master Sep 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants