From d95808b5186f1dddebf7cc9674ca655b8100a6f8 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Wed, 22 Feb 2023 17:35:13 +0000 Subject: T5025: Fix timezones and validator use timedatectl Fix timezones completion help and validotor Use 'timedatectl' insted of find zoneinfo --- interface-definitions/system-time-zone.xml.in | 2 +- src/validators/timezone | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface-definitions/system-time-zone.xml.in b/interface-definitions/system-time-zone.xml.in index ff815c9d3..f6b291984 100644 --- a/interface-definitions/system-time-zone.xml.in +++ b/interface-definitions/system-time-zone.xml.in @@ -7,7 +7,7 @@ Local time zone (default UTC) 100 - + diff --git a/src/validators/timezone b/src/validators/timezone index baf5abca2..107571181 100755 --- a/src/validators/timezone +++ b/src/validators/timezone @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2019 VyOS maintainers and contributors +# Copyright (C) 2019-2023 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -25,7 +25,7 @@ if __name__ == '__main__': parser.add_argument("--validate", action="store", required=True, help="Check if timezone is valid") args = parser.parse_args() - tz_data = cmd('find /usr/share/zoneinfo/posix -type f -or -type l | sed -e s:/usr/share/zoneinfo/posix/::') + tz_data = cmd('timedatectl list-timezones') tz_data = tz_data.split('\n') if args.validate not in tz_data: -- cgit v1.2.3