CP-309762 Update ntp-dhcp server file path

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.

When upgrade dom0 chrony version to 4, the chrony-dhcp server file
changes from `/var/lib/dhclient/chrony.servers.$interface` to
`/run/chrony-dhcp/$interface.sources`, the same with XS9.

Signed-off-by: Changlei Li <[email protected]>

Author: changlei-li

XSConsoleData.py

@@ -602,8 +602,8 @@ def AddDHCPNTP(self):
         for interface in interfaces:
             ntpServer = self.GetDHCPNTPServer(interface)
 
-            with open("/var/lib/dhclient/chrony.servers.%s" % interface, "w") as chronyFile:
-                chronyFile.write("%s iburst prefer\n" % ntpServer)
+            with open("/run/chrony-dhcp/%s.sources" % interface, "w") as chronyFile:
+                chronyFile.write("server %s iburst prefer\n" % ntpServer)
 
         # Ensure chrony is enabled
         self.EnableService("chronyd")
@@ -655,7 +655,7 @@ def RemoveDHCPNTP(self):
         newPermissions = oldPermissions & ~(stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
         os.chmod("/etc/dhcp/dhclient.d/chrony.sh", newPermissions)
 
-        getstatusoutput("rm -f /var/lib/dhclient/chrony.servers.*")
+        getstatusoutput("rm -f /run/chrony-dhcp/*.sources")
 
     def SetTimeManually(self, date):
         # Double-check authentication