Skip to content

[13.4-stable] dpcreconciler: pass the IP version mode to dhcpcd --release and --exit - #6907

Merged
eriknordmark merged 1 commit into
lf-edge:13.4-stablefrom
milan-zededa:13.4-backport-5076-dhcpcd-release-mode
Oct 26, 2026
Merged

eriknordmark merged 1 commit into
lf-edge:13.4-stablefrom
milan-zededa:13.4-backport-5076-dhcpcd-release-mode

Conversation

@milan-zededa

Copy link
Copy Markdown
Contributor

Description

Backport of a small part of #5076 to 13.4-stable (that PR was backported to 14.5-stable as #5143).

Partial backport and a complete rework: this is not a cherry-pick. #5076 upgrades dhcpcd and adds IPv6 support, none of which is in 13.4-stable (it uses the dhcpcd from Alpine). Only one detail of its dhcpcd handling is applied by hand: dhcpcd --release and dhcpcd --exit get the same --ipv4only / --ipv6only flag the client was started with.

dhcpcd started with --ipv4only or --ipv6only keeps its PID file and control socket under a mode-specific name, so both commands without the flag fail with "dhcpcd is not running" while the process is alive. A DHCP client could never be stopped; for example, switching an IPv4-only DHCP port to a static IP left the old dhcpcd (and its lease) in place and the new config could not be applied.

Without this fix TestNetworkConfigFallback fails.

PR dependencies

None.

How to test and validate this PR

Covered by the evetest test TestNetworkConfigFallback (added to 13.4-stable by #6899):

EVETEST_EVE_VERSION=<13.4-stable build with this PR> make evetest NAME=TestNetworkConfigFallback

Changelog notes

Fixed stopping of the DHCP client of a port started in IPv4-only or IPv6-only mode, which prevented switching such a port to a static IP configuration.

Checklist

  • I've provided a proper description
  • I've added the proper documentation
  • I've tested my PR on amd64 device
  • I've tested my PR on arm64 device
  • I've written the test verification instructions
  • I've set the proper labels to this PR

For backport PRs (remove it if it's not a backport):

  • I've added a reference link to the original PR
  • PR's title follows the template

And the last but not least:

  • I've checked the boxes above, or I've provided a good reason why I didn't
    check them.

dhcpcd started with --ipv4only or --ipv6only keeps its PID file and control
socket under a mode-specific name. "dhcpcd --release" and "dhcpcd --exit"
without the same flag therefore fail with "dhcpcd is not running" while the
process is alive, so a DHCP client could never be stopped. For example,
switching an IPv4-only DHCP port to a static IP left the old dhcpcd (and its
lease) in place and the new config could not be applied.

Pass the flag to both commands, as dhcpcdExists already does.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Signed-off-by: Milan Lenco <milan@zededa.com>
@codecov

codecov Bot commented Oct 22, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 32.66%. Comparing base (8077a3d) to head (42ab48f).
⚠️ Report is 319 commits behind head on 13.4-stable.

Additional details and impacted files
@@               Coverage Diff               @@
##           13.4-stable    #6907      +/-   ##
===============================================
+ Coverage        24.78%   32.66%   +7.88%     
===============================================
  Files                8        9       +1     
  Lines             1138     1090      -48     
===============================================
+ Hits               282      356      +74     
+ Misses             788      654     -134     
- Partials            68       80      +12     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@eriknordmark
eriknordmark merged commit 0123bea into lf-edge:13.4-stable Oct 26, 2026
45 checks passed
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.

3 participants