From 1376b1900d6bda4cbf7c9082e7cd201f6abcbab0 Mon Sep 17 00:00:00 2001 From: OpenGnSys Support Team Date: Tue, 30 Jul 2024 09:30:44 +0200 Subject: live: remove old image and checksum file on download Restoring an updated image file (with different checksum) could fail while the old checksum file could remain in place. Remove image and checksum file before fetching the new files. --- src/live/ogOperations.py | 10 +++++++++- src/utils/tiptorrent.py | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/live/ogOperations.py b/src/live/ogOperations.py index 7bb2528..d77fe65 100644 --- a/src/live/ogOperations.py +++ b/src/live/ogOperations.py @@ -185,8 +185,16 @@ class OgLiveOperations: Implies a unicast transfer. Does not use tiptorrent. """ - src = f'/opt/opengnsys/images/{image_name}.img' dst = f'{OG_CACHE_IMAGE_PATH}{image_name}.img' + try: + if os.path.exists(dst): + os.unlink(dst) + if os.path.exists(f"{dst}.full.sum"): + os.unlink(f"{dst}.full.sum") + except OSError as e: + raise OgError(f"Error deleting file {e.filename}: {e.strerror}") from e + + src = f'/opt/opengnsys/images/{image_name}.img' try: logging.info(f'Fetching image {image_name} from {src}') logging.info('*DO NOT REBOOT OR POWEROFF* the client during this time') diff --git a/src/utils/tiptorrent.py b/src/utils/tiptorrent.py index 932f164..14ede8b 100644 --- a/src/utils/tiptorrent.py +++ b/src/utils/tiptorrent.py @@ -101,6 +101,12 @@ def tip_check_csum(tip_addr, image_name): def tip_client_get(tip_addr, image_name): """ """ + image_path = f"{OG_CACHE_IMAGE_PATH}{image_name}.img" + if os.path.exists(image_path): + os.unlink(image_path) + if os.path.exists(f"{image_path}.full.sum"): + os.unlink(f"{image_path}.full.sum") + logging.info(f'Fetching image {image_name} from tiptorrent server at {tip_addr}') logging.info('*DO NOT REBOOT OR POWEROFF* the client during this time') cmd = f'tiptorrent-client {tip_addr} {image_name}.img' -- cgit v1.2.3-18-g5258