Merge remote-tracking branch 'origin/pr/255'

[grml-debootstrap.git] / grml-debootstrap

diff --git a/grml-debootstrap b/grml-debootstrap
index 3c6ef2f..879d105 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -251,8 +251,8 @@ cleanup() {
     einfo "Removing ${STAGES}" ; rmdir "$STAGES" || eend $?
   fi
 
-  if [ -n "$ARM_EFI_TARGET" ]; then
-    umount "${MNTPOINT}/boot/efi" >/dev/null 2>&1
+  if findmnt "${MNTPOINT}"/boot/efi &>/dev/null ; then
+    umount "${MNTPOINT}"/boot/efi
   fi
 
   # Remove temporary mountpoint again
@@ -1548,8 +1548,8 @@ grub_install() {
   fi
 
   if [ -n "${ARM_EFI_TARGET}" ]; then
-    mkdir -p "${MNTPOINT}/boot/efi"
-    if ! mount "${ARM_EFI_TARGET}" "${MNTPOINT}/boot/efi" ; then
+    mkdir -p "${MNTPOINT}"/boot/efi
+    if ! mount "${ARM_EFI_TARGET}" "${MNTPOINT}"/boot/efi ; then
       eerror "Error: Mounting ${ARM_EFI_TARGET} failed, can not continue."
       bailout 1
     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,8 +1695,8 @@ umount_target() {
      return 0
   fi
 
-  if [ -n "${ARM_EFI_TARGET}" ]; then
-    umount "${MNTPOINT}/boot/efi"
+  if findmnt "${MNTPOINT}"/boot/efi &>/dev/null ; then
+    umount "${MNTPOINT}"/boot/efi
   fi
 
   umount "${MNTPOINT}"