From 14e8a829e40f2ed801a05b783507e3feb0e005fc Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Mon, 11 Dec 2023 11:23:12 -0500
Subject: [PATCH] style fix: always use "${MNTPOINT}"/boot/efi

instead of sometimes mixed with "${MNTPOINT}/boot/efi"
---
 grml-debootstrap | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/grml-debootstrap b/grml-debootstrap
index 3c6ef2f..037e83b 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -252,7 +252,7 @@ cleanup() {
   fi
 
   if [ -n "$ARM_EFI_TARGET" ]; then
-    umount "${MNTPOINT}/boot/efi" >/dev/null 2>&1
+    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
@@ -1696,7 +1696,7 @@ umount_target() {
   fi
 
   if [ -n "${ARM_EFI_TARGET}" ]; then
-    umount "${MNTPOINT}/boot/efi"
+    umount "${MNTPOINT}"/boot/efi
   fi
 
   umount "${MNTPOINT}"
-- 
2.1.4