diff options
| -rw-r--r-- | python/vyos/kea.py | 2 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_service_dhcp-server.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/python/vyos/kea.py b/python/vyos/kea.py index 5fe070c54..74ffa3fb1 100644 --- a/python/vyos/kea.py +++ b/python/vyos/kea.py @@ -144,7 +144,7 @@ def kea_parse_options(config): if 'time_zone' in config: with open('/usr/share/zoneinfo/' + config['time_zone'], 'rb') as f: - tz_string = f.read().split(b'\n')[-2].decode('utf-8') + tz_string = f.read().split(b'\n')[-2].decode('utf-8').replace(',', '\\,') options.append({'name': 'pcode', 'data': tz_string}) options.append({'name': 'tcode', 'data': config['time_zone']}) diff --git a/smoketest/scripts/cli/test_service_dhcp-server.py b/smoketest/scripts/cli/test_service_dhcp-server.py index 129222313..a4def234c 100755 --- a/smoketest/scripts/cli/test_service_dhcp-server.py +++ b/smoketest/scripts/cli/test_service_dhcp-server.py @@ -574,7 +574,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase): self.verify_config_object( obj, ['Dhcp4', 'shared-networks', 0, 'subnet4', 0, 'option-data'], - {'name': 'pcode', 'data': 'GMT0BST,M3.5.0/1,M10.5.0'}, + {'name': 'pcode', 'data': 'GMT0BST\\,M3.5.0/1\\,M10.5.0'}, ) self.verify_config_object( obj, |