Skip to content

Conversation

GabrielBuica
Copy link
Contributor

This reverts @psafont's PR, #6586, this causing the /etc/resolve.conf to be overwritten during update, after the dhclient writes it. This happens because set_dns no longer checks the mode before applying the DNS config,

This reverts commit 05e6317, reversing changes made to 1fbdaae.

…onf (xapi-project#6586)"

This reverts commit 05e6317, reversing
changes made to 1fbdaae.

Signed-off-by: Gabriel Buica <[email protected]>
@GabrielBuica GabrielBuica force-pushed the private/dbuica/v25.29.0-fix branch from 638b883 to ec61f8e Compare September 1, 2025 15:20
@edwintorok
Copy link
Contributor

There was a 2nd commit there, bdbd975, I assume this was fine?

@GabrielBuica GabrielBuica changed the title Revert #6586 CA-416532: Revert #6586, overwrites /etc/resolve.conf Sep 1, 2025
@robhoes
Copy link
Member

robhoes commented Sep 1, 2025

Looks like both commits are reverted here. The second one, bdbd975, was the main problem.

@GabrielBuica GabrielBuica added this pull request to the merge queue Sep 1, 2025
Merged via the queue into xapi-project:master with commit 1d83693 Sep 1, 2025
16 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