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

networkmanager service: use resolved if enabled #27143

Merged

Conversation

florianjacob
Copy link
Contributor

Motivation for this change

This allows /etc/resolv.conf and dns resolution in general to be managed by systemd-resolved while still being able to use NetworkManager for the actual networking.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@0xABAB
Copy link
Contributor

0xABAB commented Jul 8, 2017

@7c6f434c Can you merge this?

@7c6f434c
Copy link
Member

7c6f434c commented Jul 8, 2017

Ah, that's a service, I usually ignore these (for obvious reasons like not running systemd). But seems simple and clear enough, I agree.

@7c6f434c 7c6f434c merged commit 0d2d5e2 into NixOS:master Jul 8, 2017
@florianjacob florianjacob deleted the networkmanager-support-resolved branch July 9, 2017 12:18
@florianjacob
Copy link
Contributor Author

@7c6f434c @0xABAB Thank you! 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants