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

dhcpcd: 8.1.4 -> 9.4.0 #116220

Closed
wants to merge 1 commit into from
Closed

dhcpcd: 8.1.4 -> 9.4.0 #116220

wants to merge 1 commit into from

Conversation

erictapen
Copy link
Member

Things done
  • Removed note about mandatory testing and moved it to passthru.tests
  • Removed patch, as it is probably the same as 56b2bb17d2ec67e1f93950944211f6cf8c40e0fb, wich landed in upstream.
  • Added myself as maintainer

Traditionally, dhcpcd upgrades can break a lot of things in a bad way, but I guess not upgrading it for 15 months isn't a solution either. So this would require thorough testing. Unfortunately I'm mostly using systemd-networkd on my machines, so I can't really provide much real world testing experience any more.

  • 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.

@erictapen
Copy link
Member Author

I'm currently testing this commit cherry-picked ontop of 20.09 and just realised, that this causes dhcpcd to timeout and restart in an endless loop. Converting to draft for now.

@erictapen erictapen marked this pull request as draft March 27, 2021 12:35
@stale
Copy link

stale bot commented Sep 26, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Sep 26, 2021
@mohe2015
Copy link
Contributor

No! but @erictapen could you rebase please?

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Sep 26, 2021
@erictapen
Copy link
Member Author

@mohe2015 Sure! Done.

- Removed note about testing and moved it to passthru.tests
- Removed patch, as it is probably the same as
  56b2bb17d2ec67e1f93950944211f6cf8c40e0fb, wich landed in upstream.
- Added myself as maintainer
@pennae
Copy link
Contributor

pennae commented Nov 26, 2021

dhcpcd 9.4.1 has been released. this also requires changes to the dhcpcd module since the pidfile location has changed:

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 31e4b6ad29..0c69caa64b 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -207,13 +207,19 @@ in
 
         serviceConfig =
           { Type = "forking";
-            PIDFile = "/run/dhcpcd.pid";
+            PIDFile = "/run/dhcpcd/pid";
             ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --quiet ${optionalString cfg.persistent "--persistent"} --config ${dhcpcdConf}";
             ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
             Restart = "always";
           };

we're currently trying to get privsep working as well, that would be nice to have.

@erictapen
Copy link
Member Author

@pennae I recently switched my last installation from dhcpcd to systemd-networkd, so I likely won't work on this any further. Maybe it would make sense for you to open a new PR with your progress? You could ofc also push to my branch.

@pennae
Copy link
Contributor

pennae commented Nov 26, 2021

can we even push to your branch as not-committers? if not we'll have to open a new PR (or also switch to networkd, which we're a bit hesitant about since last we tried it segfaulted a lot 😕)

@erictapen
Copy link
Member Author

Ah, oversaw that you don't have commit access. I guess then you'd need to open your own PR to move this forward. GitHub should have an mechanism for transferring ownership of a PR..

segfaulting a lot is not good 😳 For me it has been a pleasant transition, but I don't have a very complex networking setup.

@fpletz
Copy link
Member

fpletz commented Dec 17, 2021

Thanks! We'll continue this in #147516.

@fpletz fpletz closed this Dec 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants