Merge pull request #61 from Itxaka/zstd_tools_image

Useful to support zstd compression when working with arm images

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>

tools-image/Dockerfile

@@ -71,7 +71,7 @@ COPY --from=grub-artifacts / /arm/grub/artifacts
 RUN zypper ref && zypper dup -y
 
 ## ISO Build depedencies
-RUN zypper ref && zypper in -y xfsprogs parted util-linux-systemd e2fsprogs curl util-linux udev rsync grub2 dosfstools grub2-x86_64-efi squashfs mtools xorriso lvm2
+RUN zypper ref && zypper in -y xfsprogs parted util-linux-systemd e2fsprogs curl util-linux udev rsync grub2 dosfstools grub2-x86_64-efi squashfs mtools xorriso lvm2 zstd
 RUN mkdir /config
 
 # Arm image build deps

tools-image/build-arm-image.sh

@@ -72,14 +72,7 @@ cleanup() {
     umount $oem || true
   fi
 
-  if [ "$disable_lvm" == "false" ]; then
-    lvremove --yes KairosVG || true
-  fi
-  MAPPER_LOOP=$(basename "$LOOP")
-    for LOOPPART in $(ls /dev/mapper/"${MAPPER_LOOP}"*| awk -F'/' {'print $4'}); do
-    dmsetup remove "${LOOPPART}" || true;
-  done;
-  losetup -d "${LOOP}" || true;
+  losetup -D "${LOOP}" || true;
 }
 
 ensure_dir_structure() {