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

feat(linux.net): Modified dhcp server selection order #5378

Merged
merged 1 commit into from
Oct 2, 2024

Conversation

pierantoniomerlino
Copy link
Contributor

This PR changes the selection order of the DHCP servers.

Related Issue: This PR fixes/closes N/A

Description of the solution adopted: Since isc-dhcp-server will be deprecated, we decided to prefer dnsmasq and udhcpd instead of dhcpd in the automatic selection of the DHCP servers in the DhcpServerManager class.

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>
@mattdibi mattdibi merged commit e310e93 into develop Oct 2, 2024
3 checks passed
@mattdibi mattdibi deleted the dhcp_server_selection_order branch October 2, 2024 06:18
github-actions bot pushed a commit that referenced this pull request Oct 2, 2024
Modified dhcp server selection order

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>
(cherry picked from commit e310e93)
Copy link
Contributor

github-actions bot commented Oct 2, 2024

The backport to release-5.6.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-5.6.0 release-5.6.0
# Navigate to the new working tree
cd .worktrees/backport-release-5.6.0
# Create a new branch
git switch --create backport-5378-to-release-5.6.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e310e93616d69c7c38200b9dc9c166ec24b9ff48
# Push it to GitHub
git push --set-upstream origin backport-5378-to-release-5.6.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-5.6.0

Then, create a pull request where the base branch is release-5.6.0 and the compare/head branch is backport-5378-to-release-5.6.0.

salvatore-coppola pushed a commit that referenced this pull request Oct 4, 2024
Modified dhcp server selection order

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>
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.

2 participants