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

nixos/initrd-network: fix /etc/resolv.conf when multiple dns servers from DHCP #101099

Merged
merged 1 commit into from Oct 20, 2020
Merged

nixos/initrd-network: fix /etc/resolv.conf when multiple dns servers from DHCP #101099

merged 1 commit into from Oct 20, 2020

Conversation

rissson
Copy link
Member

@rissson rissson commented Oct 19, 2020 •
edited

Motivation for this change

Currently, when doing DNS resolution inside stage 1 when the DHCP server responded with multiple DNS servers, it fails because /etc/resolv.conf contains something like this:

nameserver 1.1.1.1 1.0.0.1
nameserver 1.1.1.1 1.0.0.1
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@rissson
Copy link
Member Author

rissson commented Oct 19, 2020

I am in the process of testing this. Will report back ASAP and backport to 20.09.

@rissson
nixos/initrd-network: fix /etc/resolv.conf when multiple dns servers …
2461c6c 
…from DHCP

Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
@rissson rissson force-pushed the initrd-network-fix-dhcp-dns-servers branch from def9a07 to 2461c6c Compare October 19, 2020 22:41
This was referenced Oct 19, 2020
Closed
Closed
@rissson
Copy link
Member Author

rissson commented Oct 19, 2020

I just tested that, it works!

@rissson rissson mentioned this pull request Oct 19, 2020
Merged
10 tasks
jonringer
jonringer approved these changes Oct 20, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

your changes look like the intended behavior, and aligns with examples of resolv.conf

@jonringer jonringer merged commit 9e6bede into NixOS:master Oct 20, 2020
@rissson rissson deleted the initrd-network-fix-dhcp-dns-servers branch October 20, 2020 11:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer 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
@rissson @jonringer