From 803377ac3c4eecbf61440bb8ec70b8b1a20262c5 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 7 Aug 2026 06:31:49 +0200
Subject: [PATCH] fix: Handle temporary cleanup failures (#2096)

---
 src/install.sh | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/install.sh b/src/install.sh
index e69de0bb..ea33f397 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -309,20 +309,15 @@ startInstall() {
       ISO="$TMP/$file"
     fi
 
-    # Work from the temporary directory so the persistent source path can
-    # later contain either the preserved ISO or the rebuilt installation image.
-    if [ -f "$BOOT" ] && [ -s "$BOOT" ]; then
-      if ! mv -f -- "$BOOT" "$ISO"; then
-        error "Failed to move ISO file from \"$BOOT\" to \"$ISO\" !"
-        exit 50
-      fi
-    fi
-
   fi
 
-  if ! rm -f -- "$BOOT"; then
-    error "Failed to remove obsolete ISO file \"$BOOT\" !"
-    exit 50
+  # Keep reusable media at its persistent path until all storage cleanup has
+  # completed successfully, so a later failure cannot strand it under $TMP.
+  if [ -n "$CUSTOM" ] || [ -z "$REUSED_ISO" ]; then
+    if ! rm -f -- "$BOOT"; then
+      error "Failed to remove obsolete ISO file \"$BOOT\" !"
+      exit 50
+    fi
   fi
 
   if ! find "$STORAGE" -maxdepth 1 -type f -iname 'data.*' -not -iname '*.iso' -delete; then
@@ -344,6 +339,15 @@ startInstall() {
     checkMemory "$VERSION" || exit 67
   fi
 
+  # Work from the temporary directory so the persistent source path can
+  # later contain either the preserved ISO or the rebuilt installation image.
+  if [ -z "$CUSTOM" ] && [ -f "$BOOT" ] && [ -s "$BOOT" ]; then
+    if ! mv -f -- "$BOOT" "$ISO"; then
+      error "Failed to move ISO file from \"$BOOT\" to \"$ISO\" !"
+      exit 50
+    fi
+  fi
+
   return 0
 }
 
@@ -548,7 +552,11 @@ finishInstall() {
 
   reserveSambaPorts || return 1
 
-  rm -rf "$TMP"
+  if ! rm -rf -- "$TMP"; then
+    error "Failed to remove directory \"$TMP\" !"
+    return 1
+  fi
+
   return 0
 }