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

nixos/dnsmasq: Fix regressions during the systemd update #3940

Merged
merged 1 commit into from
Sep 3, 2014

Conversation

wkennington
Copy link
Contributor

Don't merge this until I've confirmed this is the intended behavior with users of these options.

wkennington referenced this pull request Sep 2, 2014
* The module now has systemd config

* Add resolveLocalQueries option which sets up it as a dns server for
  local host (including reasonable setup of resolvconf)

* Add "dnsmasq" user for running daemon

* Enabled dbus and dnssec support for the package

Conflicts:
	nixos/modules/misc/ids.nix
@tailhook
Copy link
Contributor

tailhook commented Sep 2, 2014

What is the regression? Does dhcpcd changed? Or doesn't it work with openresolv any more?

@wkennington wkennington force-pushed the master.dnsmasq branch 10 times, most recently from 535e335 to 3e09dfb Compare September 3, 2014 00:17
@wkennington
Copy link
Contributor Author

Good to merge

@tailhook
Copy link
Contributor

tailhook commented Sep 3, 2014

Why do you remove systemPackages?

@wkennington
Copy link
Contributor Author

Why do you need it? The system path doesn't need to contain openresolv.

@tailhook
Copy link
Contributor

tailhook commented Sep 3, 2014

Hm. Probably you're right.

7c6f434c added a commit that referenced this pull request Sep 3, 2014
nixos/dnsmasq: Fix regressions during the systemd update
@7c6f434c 7c6f434c merged commit a82c623 into NixOS:master Sep 3, 2014
@wkennington wkennington deleted the master.dnsmasq branch September 7, 2014 00:46
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.

4 participants