Skip to content

dhcpcd: fix RA time unit confusion#76798

Merged
flokli merged 1 commit intoNixOS:masterfrom
andersk:dhcpcd-ra-time-units
Jan 2, 2020
Merged

dhcpcd: fix RA time unit confusion#76798
flokli merged 1 commit intoNixOS:masterfrom
andersk:dhcpcd-ra-time-units

Conversation

@andersk
Copy link
Contributor

@andersk andersk commented Jan 1, 2020

Motivation for this change

Fixes #76710 (channel blocker). Submitted upstream as NetworkConfiguration/dhcpcd#12.

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.
Notify maintainers

cc @edolstra @fpletz

@andersk andersk mentioned this pull request Jan 1, 2020
Closed
@ofborg ofborg bot requested review from edolstra and fpletz January 1, 2020 21:09
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 1, 2020
fpletz
fpletz approved these changes Jan 1, 2020
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Awesome! Thanks a lot! 🎉

@andersk
dhcpcd: fix RA time unit confusion
e474db2 
Fixes NixOS#76710.  Submitted upstream as NetworkConfiguration/dhcpcd#12.

Signed-off-by: Anders Kaseorg <[email protected]>
@andersk andersk force-pushed the dhcpcd-ra-time-units branch from 517e2fb to e474db2 Compare January 1, 2020 23:32
@andersk
Copy link
Contributor Author

andersk commented Jan 1, 2020

This now uses fetchpatch to get the patch from upstream, where it was just committed.

@ofborg ofborg bot requested a review from fpletz January 1, 2020 23:48
@flokli
Copy link
Member

flokli commented Jan 2, 2020

@GrahamcOfBorg test ipv6

@flokli flokli merged commit fa34e97 into NixOS:master Jan 2, 2020
@flokli
Copy link
Member

flokli commented Jan 2, 2020

Thanks!

@nlewo
Copy link
Member

nlewo commented Jan 2, 2020

Awesome! thanks!

@andersk andersk deleted the dhcpcd-ra-time-units branch December 26, 2022 21:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@edolstra edolstra Awaiting requested review from edolstra

@fpletz fpletz Awaiting requested review from fpletz

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

nixos.tests.ipv6.x86_64-linux fails blocking nixos channels

4 participants

@andersk @flokli @nlewo @fpletz