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

Jump to bottom

NetworkManager fixes #62956

Merged
merged 5 commits into from Jul 13, 2019
Merged

NetworkManager fixes #62956

merged 5 commits into from Jul 13, 2019

Conversation

abbradar
Copy link
Member

Motivation for this change

Assortment of NetworkManager fixes that I did while working on #62955. In particular insertNameservers and appendNameservers now work simultaneously and strongswan configuration isn't installed when not enabled.

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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@abbradar
networkmanager service: override DNS when it's actually needed
68de116 
Logic expression was incorrect before.
@abbradar
networkmanager service: fix simultaneous append and insert of nameser…
33b7e5f 
…vers

Before only one of them could work at the same time.
@worldofpeace worldofpeace self-requested a review June 10, 2019 17:44
@abbradar
Copy link
Member Author

@worldofpeace Did you manage to try this perchance?

@worldofpeace
Copy link
Contributor

@worldofpeace Did you manage to try this perchance?

I'm afraid it flew away from me 🐦

I should be able to give it a test today, I think I've looked over the changes prior and didn't see any glaring issues.

@abbradar @worldofpeace
Update nixos/modules/services/networking/networkmanager.nix
48b3e70 
Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
worldofpeace
worldofpeace approved these changes Jul 13, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Seems fine to me, and tested.

@abbradar
Copy link
Member Author

OK, let's merge then - I used it quite a bit too and tested with nameservers.

@abbradar abbradar merged commit 8951505 into NixOS:master Jul 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

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
2 participants
@abbradar @worldofpeace