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/networkd: expose RapidCommit in DHCPv4 network unit section #366038

Merged
merged 1 commit into from
Dec 18, 2024

Conversation

lattwood
Copy link
Contributor

@lattwood lattwood commented Dec 18, 2024

This PR exposes the RapidCommit option in the [DHCPv4] section of systemd-networkd network units. Disabling this option is required to obtain a DHCPv4 lease from some old/misconfigured DHCP servers. This was already exposed for DHCPv6.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Dec 18, 2024
@lattwood
Copy link
Contributor Author

It would be fantastic if this got a backport, but I've no idea where to begin with that.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 18, 2024
@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Dec 18, 2024
@lattwood
Copy link
Contributor Author

lattwood commented Dec 18, 2024

Tested & validated as working on aarch64, as I can now get a DHCPv4 lease from my ISP post upgrade to 24.11.

Disabling this option is required to obtain a DHCPv4 lease from
some old/misconfigured DHCP servers. This was already exposed for
DHCPv6.
@lattwood lattwood force-pushed the lattwood/rapidcommit_dhcpv4 branch from 49a315e to 6c32471 Compare December 18, 2024 05:04
@lattwood lattwood requested a review from philiptaron December 18, 2024 05:05
@@ -877,6 +877,7 @@ let
"IAID"
"RequestBroadcast"
"RouteMetric"
"RapidCommit"
Copy link
Contributor

Choose a reason for hiding this comment

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

Docs (for anyone coming on this PR later, no need to update the PR for this.)

@philiptaron philiptaron merged commit 3fa96e6 into NixOS:master Dec 18, 2024
24 of 25 checks passed
@lattwood
Copy link
Contributor Author

Hi @philiptaron, what's involved in backporting this to 24.11?

It looks like adding a label to this PR/issue and rerunning the action would do it but I don't have permissions.

image

@philiptaron philiptaron added the backport release-24.11 Backport PR automatically label Dec 18, 2024
@philiptaron
Copy link
Contributor

It looks like adding a label to this PR/issue and rerunning the action would do it but I don't have permissions.

Yep, did it.

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Dec 18, 2024

Successfully created backport PR for release-24.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12. first-time contribution This PR is the author's first one; please be gentle! backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants