summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2025-08-27 13:10:27 -0500
committerJohn Estabrook <jestabro@vyos.io>2025-08-27 13:10:27 -0500
commit9f80e374f67282d5f6662acc8aec70eba0b040de (patch)
tree1d34cb9f96d413343062f441a666dd643e309c9d /src
parentadb3e06fc90e092d414be19240c490a92aad7c3f (diff)
downloadvyos-1x-9f80e374f67282d5f6662acc8aec70eba0b040de.tar.gz
vyos-1x-9f80e374f67282d5f6662acc8aec70eba0b040de.zip
T7759: Revert "T7709: add atomic write for config file save"
The utility write_file_atomic does not correctly update the file in the bind mount directory /config. Revert for investigation. This reverts commit c140f827f3117609908a3a18034027d3d78149ac.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/helpers/vyos-save-config.py16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/helpers/vyos-save-config.py b/src/helpers/vyos-save-config.py
index fa1f5625d..adf62b71d 100755
--- a/src/helpers/vyos-save-config.py
+++ b/src/helpers/vyos-save-config.py
@@ -23,18 +23,15 @@ from argparse import ArgumentParser
from vyos.config import Config
from vyos.remote import urlc
-from vyos.component_version import add_system_version_string
+from vyos.component_version import add_system_version
from vyos.defaults import directories
-from vyos.utils.file import write_file_atomic
DEFAULT_CONFIG_PATH = os.path.join(directories['config'], 'config.boot')
remote_save = None
parser = ArgumentParser(description='Save configuration')
parser.add_argument('file', type=str, nargs='?', help='Save configuration to file')
-parser.add_argument(
- '--write-json-file', type=str, help='Save JSON of configuration to file'
-)
+parser.add_argument('--write-json-file', type=str, help='Save JSON of configuration to file')
args = parser.parse_args()
file = args.file
json_file = args.write_json_file
@@ -59,14 +56,7 @@ write_file = save_file if remote_save is None else NamedTemporaryFile(delete=Fal
# config_tree is None before boot configuration is complete;
# automated saves should check boot_configuration_complete
config_str = None if ct is None else ct.to_string()
-versioned_config_str = add_system_version_string(config_str)
-
-try:
- with write_file_atomic(write_file) as f:
- f.write(versioned_config_str)
-except OSError as e:
- print(f'failed to write config file: {e}')
- sys.exit(1)
+add_system_version(config_str, write_file)
if json_file is not None and ct is not None:
try: