Skip to content

overlays.ifstate: add dhcpcd_latest (upstream 10.5.2) for netif - #43

Merged
andrewthomaslee merged 1 commit into
mainfrom
dhcpcd-10-5-2
Nov 17, 2026
Merged

andrewthomaslee merged 1 commit into
mainfrom
dhcpcd-10-5-2

Conversation

@andrewthomaslee

Copy link
Copy Markdown
Member

What

  • overlays/ifstate.nix: new attribute dhcpcd_latest, the unpatched upstream dhcpcd 10.5.2 on the nixpkgs build recipe. Version guard: it becomes prev.dhcpcd once nixpkgs ships 10.5.2 or newer. patches is emptied with the new source.
  • pkgs.dhcpcd is unchanged (10.3.2 with the two upstream lost-lease commits; same store path as before).
  • flake-parts/packages.nix: exports dhcpcd_latest.
  • README.md: the two attributes and why.

Why

The owner chose the upstream release over our patch for clanServices netif. 10.5.2 has the lost-lease fix and four CVE fixes (CVE-2026-56113, -56114, -56116, -56117).

Swapping pkgs.dhcpcd itself was tested first and would have broken DHCP on every machine with networking.useDHCP: from 10.5.1 dhcpcd calls chown on its control socket, the NixOS dhcpcd.service system-call filter kills it (dhcpcd manager hungup, restart loop, no lease). NixOS/nixpkgs#562813 adds @chown to the unit and is still open. netif starts dhcpcd from an IfState hook, so it can take 10.5.2 by name now.

Checks

  • fmt, check: pass.
  • nix build .#dhcpcd .#dhcpcd_latest: builds; dhcpcd store path unchanged.
  • Throwaway VM probes on the builder, each the only build, with this exact dhcpcd_latest:
    • netif-style (IfState hook): leases, DNS, renewal, real carrier loss, five down/up cycles for DHCPv4 and DHCPv6: all pass, no eloop_event_add. Same with ipv4only.
    • stock NixOS dhcpcd.service + 10.5.2: fails to start.
    • stock unit + SystemCallFilter = ["@chown"] + 10.5.2: passes (boot, five down/up, carrier loss, renewal, unit restart, reboot).
    • stock unit + pkgs.dhcpcd (control): passes.
  • Not run: aarch64 build (CI covers it).

For the reviewer

  • No consumer changes behaviour from this PR: nothing uses dhcpcd_latest yet. clanServices switches netif to it in its next phase.
  • Open owner decision: machines on the stock unit keep 10.3.2 until nixpkgs ships 10.5. Moving them sooner needs the unit change and the package in one deploy (modules repo).

🤖 Generated with Claude Code

The owner chose the upstream release over the two-commit patch. A
fleet-wide swap of pkgs.dhcpcd is not possible yet: from 10.5.1 dhcpcd
calls chown on its control socket, and the system-call filter of the
NixOS dhcpcd.service kills it at start (NixOS/nixpkgs#562813 is open).
So 10.5.2 comes as its own attribute, dhcpcd_latest, for clanServices
netif, which starts dhcpcd from an IfState hook. pkgs.dhcpcd keeps
10.3.2 with the two upstream commits, unchanged.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
@andrewthomaslee
andrewthomaslee enabled auto-merge (squash) November 17, 2026 11:21
@andrewthomaslee
andrewthomaslee merged commit 7b60ddc into main Nov 17, 2026
3 checks passed
@andrewthomaslee
andrewthomaslee deleted the dhcpcd-10-5-2 branch November 17, 2026 11:23
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.

1 participant