From 9f80e374f67282d5f6662acc8aec70eba0b040de Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 27 Aug 2025 13:10:27 -0500 Subject: 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. --- python/vyos/component_version.py | 10 ---------- python/vyos/utils/file.py | 36 ------------------------------------ 2 files changed, 46 deletions(-) (limited to 'python') diff --git a/python/vyos/component_version.py b/python/vyos/component_version.py index 13fb8333f..136bd36e8 100644 --- a/python/vyos/component_version.py +++ b/python/vyos/component_version.py @@ -209,16 +209,6 @@ def version_info_prune_component(x: VersionInfo, y: VersionInfo) -> VersionInfo: x.component = {k: v for k, v in x.component.items() if k in y.component} -def add_system_version_string(config_str: str = None) -> str: - """Wrap config string with system version and return string.""" - version_info = version_info_from_system() - if config_str is not None: - version_info.update_config_body(config_str) - version_info.update_footer() - - return version_info.write_string() - - def add_system_version(config_str: str = None, out_file: str = None): """Wrap config string with system version and write to out_file. diff --git a/python/vyos/utils/file.py b/python/vyos/utils/file.py index c363b5bdc..1e2de2b39 100644 --- a/python/vyos/utils/file.py +++ b/python/vyos/utils/file.py @@ -14,9 +14,6 @@ # License along with this library. If not, see . import os -import tempfile -from contextlib import contextmanager - from vyos.utils.permission import chown def makedir(path, user=None, group=None): @@ -188,36 +185,3 @@ def wait_for_file_write_complete(file_path, pre_hook=None, timeout=None, sleep_i """ Waits for a process to close a file after opening it in write mode. """ wait_for_inotify(file_path, event_type='IN_CLOSE_WRITE', pre_hook=pre_hook, timeout=timeout, sleep_interval=sleep_interval) - -def copy_chown(source, target): - import shutil - import stat - - shutil.copy2(source, target) - st = os.stat(source) - os.chown(target, st[stat.ST_UID], st[stat.ST_GID]) - - -@contextmanager -def write_file_atomic(file_path, mode='w'): - with open(file_path, mode) as _: - pass - temp_file = tempfile.NamedTemporaryFile( - delete=False, dir=os.path.dirname(file_path) - ) - if os.path.exists(file_path): - copy_chown(file_path, temp_file.name) - - file = open(temp_file.name, mode) - try: - yield file - finally: - file.flush() - os.fsync(file.fileno()) - file.close() - os.replace(temp_file.name, file_path) - if os.path.exists(temp_file.name): - try: - os.unlink(temp_file.name) - except Exception: - pass -- cgit v1.2.3