From: Patrick Schleizer <adrelanos@whonix.org>
Date: Mon, 11 Dec 2023 16:39:38 +0000 (-0500)
Subject: fix error handling for unmounting on the arm64 architecture
X-Git-Tag: v0.106~7^2
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=cc891dfa8fa1f950c3ac006351c19a80352c8155

fix error handling for unmounting on the arm64 architecture
---

diff --git a/grml-debootstrap b/grml-debootstrap
index 037e83b..879d105 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -251,7 +251,7 @@ cleanup() {
     einfo "Removing ${STAGES}" ; rmdir "$STAGES" || eend $?
   fi
 
-  if [ -n "$ARM_EFI_TARGET" ]; then
+  if findmnt "${MNTPOINT}"/boot/efi &>/dev/null ; then
     umount "${MNTPOINT}"/boot/efi
   fi
 
@@ -1682,7 +1682,7 @@ grub_install() {
   umount "${MNTPOINT}"/dev/pts
   try_umount 3 "${MNTPOINT}"/dev
 
-  if [ -n "$VMEFI" ]; then
+  if findmnt "${MNTPOINT}"/boot/efi &>/dev/null ; then
     umount "${MNTPOINT}"/boot/efi
   fi
 
@@ -1695,7 +1695,7 @@ umount_target() {
      return 0
   fi
 
-  if [ -n "${ARM_EFI_TARGET}" ]; then
+  if findmnt "${MNTPOINT}"/boot/efi &>/dev/null ; then
     umount "${MNTPOINT}"/boot/efi
   fi