diff options
| author | Nicolas Vandamme <n.vandamme@firis-system.lu> | 2025-09-01 16:59:44 +0200 |
|---|---|---|
| committer | Nicolas Vandamme <n.vandamme@firis-system.lu> | 2025-09-01 16:59:44 +0200 |
| commit | b9f60711392463af1892a30472fba6622a73390a (patch) | |
| tree | 7b7f7942ddb2bc966b917834e16bc6d2b80baa75 /src/migration-scripts/ntp | |
| parent | 4f0f02e9e38183850021f9b9e19caab3c3062233 (diff) | |
| parent | b759dad71c358ea8772ab4973e71660c10a12524 (diff) | |
| download | vyos-1x-b9f60711392463af1892a30472fba6622a73390a.tar.gz vyos-1x-b9f60711392463af1892a30472fba6622a73390a.zip | |
Merge branch 'current' into current
Diffstat (limited to 'src/migration-scripts/ntp')
| -rw-r--r-- | src/migration-scripts/ntp/1-to-2 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/migration-scripts/ntp/1-to-2 b/src/migration-scripts/ntp/1-to-2 index fd7b08221..d5f800922 100644 --- a/src/migration-scripts/ntp/1-to-2 +++ b/src/migration-scripts/ntp/1-to-2 @@ -1,4 +1,4 @@ -# Copyright 2023-2024 VyOS maintainers and contributors <maintainers@vyos.io> +# Copyright 2023-2025 VyOS maintainers and contributors <maintainers@vyos.io> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -25,6 +25,11 @@ def migrate(config: ConfigTree) -> None: # Nothing to do return + # T6911: do not migrate NTP configuration if mandatory server is missing + if not config.exists(base_path + ['server']): + config.delete(base_path) + return + # config.copy does not recursively create a path, so create ['service'] if # it doesn't yet exist, such as for config.boot.default if not config.exists(['service']): |