Merge pull request #624 from xcp-ng/remaster-error-handling

iso-remaster: on error, only attempt unmount mounted stuff
xcp-ng · Sep 27, 2023 · e553289 · e553289
2 parents 342cee5 + dc45d00
commit e553289
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/scripts/iso-remaster/iso-remaster.sh b/scripts/iso-remaster/iso-remaster.sh
@@ -105,15 +105,17 @@ umountrm() {
     rmdir "$1"
 }
 
+USERMOUNTS=()
 exitcleanup() {
     set +e
     case $OPMODE in
         copy)
             rm -rf "$RWISO"
             ;;
         fuse)
-            umountrm "$MNT"
-            umountrm "$RWISO"
+            for MOUNT in "${USERMOUNTS[@]}"; do
+                umountrm "$MOUNT"
+            done
             rm -rf "$OVLRW" "$OVLWD"
             ;;
         *)
@@ -155,6 +157,7 @@ fuse)
     OVLRW=$(mktemp -d ovlfs-upper.XXXXXX)
     OVLWD=$(mktemp -d ovlfs-work.XXXXXX)
     fuseiso "$INISO" "$MNT"
+    MOUNTS+=("$MNT")
 
     # genisoimage apparently needs write access to those
     mkdir -p "$OVLRW/boot/isolinux"
@@ -190,6 +193,7 @@ copy)
 fuse)
     # produce a merged iso tree
     fuse-overlayfs -o lowerdir="$MNT" -o upperdir="$OVLRW" -o workdir="$OVLWD" "$RWISO"
+    MOUNTS+=("$RWISO")
     ;;
 *)
     die "unknown mode '$OPMODE'"