diff options
| author | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-09-05 09:58:03 +0200 |
|---|---|---|
| committer | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-09-05 09:58:03 +0200 |
| commit | 46fb580fa0131f6815bbcfc95631654f6fe999a8 (patch) | |
| tree | 73ae9fcaa97d5cfab7883bc6fbf3ea036677c2a3 /src/conf_mode/system-timezone.py | |
| parent | 0377b8e40b0d3e424da11194e97659c5066c0a1d (diff) | |
| parent | b6b61bc9ecf1328e67a0c15934f8bf3966a6b66d (diff) | |
| download | vyos-1x-46fb580fa0131f6815bbcfc95631654f6fe999a8.tar.gz vyos-1x-46fb580fa0131f6815bbcfc95631654f6fe999a8.zip | |
Merge remote-tracking branch 'upstream/current' into current
Diffstat (limited to 'src/conf_mode/system-timezone.py')
| -rwxr-xr-x | src/conf_mode/system-timezone.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/conf_mode/system-timezone.py b/src/conf_mode/system-timezone.py index 0f4513122..4d9f017a6 100755 --- a/src/conf_mode/system-timezone.py +++ b/src/conf_mode/system-timezone.py @@ -29,9 +29,12 @@ default_config_data = { 'name': 'UTC' } -def get_config(): +def get_config(config=None): tz = deepcopy(default_config_data) - conf = Config() + if config: + conf = config + else: + conf = Config() if conf.exists('system time-zone'): tz['name'] = conf.return_value('system time-zone') |