--- grub-installer	2022-06-15 09:37:55.857039200 +0100
+++ grub-installer-patched	2022-06-15 09:41:36.407548400 +0100
@@ -1093,6 +1093,13 @@
 		        grub_install_params="$grub_install_params --target x86_64-efi"
                 fi
 
+		if [ -n "$bootremovable" ]; then
+			grub_install_params="$grub_install_params --removable --no-nvram"
+			umount "$ROOT/boot/efi"
+			bootdev_actual="$(fdisk -l | grep "$bootdev" | grep "EFI System" | cut -d' ' -f1)"
+			mount "$bootdev_actual" "$ROOT/boot/efi"
+		fi
+
 		CODE=0
 		case $ARCH:$grub_package in
 		    *:grub|*:grub-pc|*:grub-efi*|sparc:grub-ieee1275|ppc64el/*:grub-ieee1275)