From 8349d3e6a8cad1c282beb6a0552edf30cd8d2788 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Mon, 22 Apr 2024 13:18:17 -0500 Subject: image-tools: T6260: remove persistence image directory if no space error (cherry picked from commit c2fc2dba32ba861684f5e34635f810c56d551d51) --- src/op_mode/image_installer.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src') diff --git a/src/op_mode/image_installer.py b/src/op_mode/image_installer.py index c401a8c20..185d12c49 100755 --- a/src/op_mode/image_installer.py +++ b/src/op_mode/image_installer.py @@ -26,6 +26,7 @@ from os import environ from typing import Union from urllib.parse import urlparse from passlib.hosts import linux_context +from errno import ENOSPC from psutil import disk_partitions @@ -886,6 +887,16 @@ def add_image(image_path: str, vrf: str = None, username: str = '', if set_as_default: grub.set_default(image_name, root_dir) + except OSError as e: + # if no space error, remove image dir and cleanup + if e.errno == ENOSPC: + cleanup(mounts=[str(iso_path)], + remove_items=[f'{root_dir}/boot/{image_name}']) + else: + # unmount an ISO and cleanup + cleanup([str(iso_path)]) + exit(f'Error: {e}') + except Exception as err: # unmount an ISO and cleanup cleanup([str(iso_path)]) -- cgit v1.2.3