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.

Sign up for GitHub

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

Jump to bottom

[Backport 18.09] nixos/networkmanager: fix VPN plugin service definition targets #46358

Closed
wants to merge 1 commit into from
Closed

[Backport 18.09] nixos/networkmanager: fix VPN plugin service definition targets #46358

wants to merge 1 commit into from

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Sep 8, 2018

Motivation for this change

#46197

NetworkManager VPN plugins have moved their nm-${plugin}-service.name files from /etc to /lib.
Backport of #46201 to 18.09

cc @jtojnar @tadfisher

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.

@flokli flokli changed the base branch from master to release-18.09 September 8, 2018 09:43
@xeji
Copy link
Contributor

xeji commented Sep 8, 2018

Is this just a cherry-pick from #46201 (which I just merged), or is there a difference?

@flokli
Copy link
Contributor Author

flokli commented Sep 8, 2018

@xeji That's just the cherry-pick, don't know why GrahamcOfBorg added all these labels…

@xeji
Copy link
Contributor

xeji commented Sep 8, 2018

@flokli thanks for doing this. But there's no need to open a separate PR for a simple cherry-pick , just mention on the master PR that it needs backporting.
In the future, if you cherry-pick from master, please use git cherry-pick -x to include a reference to the original commit for better traceability.

Cherry-picked from master to 18.09 in 43c9869

@xeji xeji closed this Sep 8, 2018
@flokli flokli deleted the nm-vpn-fix-18.09 branch September 8, 2018 12:45
@flokli
Copy link
Contributor Author

flokli commented Sep 8, 2018

@xeji Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edolstra edolstra Awaiting requested review from edolstra

@FRidh FRidh Awaiting requested review from FRidh

@nbp nbp Awaiting requested review from nbp

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@flokli @xeji @GrahamcOfBorg