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

[20.09] nixos/initrd-network: fix /etc/resolv.conf when multiple dns servers from DHCP #101103

Merged
merged 1 commit into from Oct 20, 2020
Merged

[20.09] nixos/initrd-network: fix /etc/resolv.conf when multiple dns servers from DHCP #101103

merged 1 commit into from Oct 20, 2020

Conversation

rissson
Copy link
Member

@rissson rissson commented Oct 19, 2020

Motivation for this change

Backport of #101099

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.

jonringer
jonringer reviewed 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.

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

should be 9e6bede

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

Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
(cherry picked from commit 9e6bede)
@rissson rissson force-pushed the initrd-network-fix-dhcp-dns-servers-backport-20.09 branch from 411cdaa to d903c35 Compare October 20, 2020 11:38
@rissson
Copy link
Member Author

rissson commented Oct 20, 2020

Sorry, my bad. Fixed it.

@jonringer
Copy link
Contributor

It's because I rebase and merge most PRs.

The git history is nicer

@jonringer jonringer merged commit 7b32c9d into NixOS:release-20.09 Oct 20, 2020
@rissson rissson deleted the initrd-network-fix-dhcp-dns-servers-backport-20.09 branch April 18, 2021 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer Awaiting requested review from jonringer

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