CA-417641 Update ntp-dhcp server file path #74
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xsconsole can set ntp to Use DHCP NTP Servers or Use Default NTP Servers, Provide NTP Servers Manually. This is so-called dhcp default and manual mode. When switching from other modes to DHCP, the DHCP-provided NTP servers should be added to the Chrony sources. Conversely, they should be removed when switching away from DHCP. In XS9, the ntp-dhcp server path is outdated as the chrony version update, comparing to XS8. xs8-chrony: version 3.2, the server file with dhclient is /var/lib/dhclient/chrony.servers.$interface xs9-chrony: version 4.6.1, the server file with dhclient is /run/chrony-dhcp/$interface.sources So the path should be updated. Signed-off-by: Changlei Li <[email protected]>
|
Test: After the fix switch form |
changlei-li
requested review from
DeliZhangX,
chunjiez,
liulinC,
rosslagerwall and
stephenchengCloud
DeliZhangX
approved these changes
Sep 25, 2025
stephenchengCloud
approved these changes
Sep 25, 2025
rosslagerwall
approved these changes
Sep 25, 2025
liulinC
reviewed
Sep 26, 2025
| os.chmod("/etc/dhcp/dhclient.d/chrony.sh", newPermissions) | ||
|
|
||
| getstatusoutput("rm -f /var/lib/dhclient/chrony.servers.*") | ||
| getstatusoutput("rm -f /run/chrony-dhcp/*.sources") |
There was a problem hiding this comment.
The file is removed,
what happens if user want to change back to dhcp mode? (without interface configure update, e.g: chrony.sh has no chance to run to regenerate the file)
There was a problem hiding this comment.
See L605 above in AddDHCPNTP, the file will be created and filled.
liulinC
approved these changes
Sep 26, 2025
changlei-li
deleted the
private/changleli/update-dhcp-chrony-config-file
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
xsconsole can set ntp to
Use DHCP NTP ServersorUse Default NTP Servers,Provide NTP Servers Manually. This is so-calleddhcpdefault andmanualmode.When switching from other modes to DHCP, the DHCP-provided NTP servers should be added to the Chrony sources. Conversely, they should be removed when switching away from DHCP.
In XS9, the ntp-dhcp server path is outdated as the chrony version update, comparing to XS8.
xs8-chrony: version 3.2, the server file with dhclient is
/var/lib/dhclient/chrony.servers.$interfacexs9-chrony: version 4.6.1, the server file with dhclient is
/run/chrony-dhcp/$interface.sourcesIt takes effect by write
server $source iburst preferto/run/chrony-dhcp/$interface.sourcesand/run/chrony-dhcpis sourcedir in/etc/chrony.conf.