From 777625016345a9ca7e93f9e4dfa845dab91fc905 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Tue, 10 May 2016 10:00:27 +0100
Subject: [PATCH] Properly fix the mtools problem

---
 tools/boot/stretch/boot-arm64 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/boot/stretch/boot-arm64 b/tools/boot/stretch/boot-arm64
index ea4a46e8..e77f4ec9 100755
--- a/tools/boot/stretch/boot-arm64
+++ b/tools/boot/stretch/boot-arm64
@@ -13,6 +13,9 @@
 set -e
 #set -x
 
+# Workaround for #823881:
+export MTOOLS_SKIP_CHECK=1
+
 N=$1
 CDDIR=$2
 BOOTDIR=
@@ -127,13 +130,12 @@ if [ -d boot$N/grub ] ; then
     block_bytes=1024
     blocks=$(($tracks * $track_bytes / $block_bytes))
 
-    # Workaround for #823881:
-    export MTOOLS_SKIP_CHECK=1
+    rm -f $CDDIR/boot/grub/efi.img
+    mkfs.msdos -v -C "$CDDIR/boot/grub/efi.img" $blocks >/dev/null
     mmd -i "$CDDIR/boot/grub/efi.img" ::efi
     mmd -i "$CDDIR/boot/grub/efi.img" ::efi/boot
     mcopy -o -i "$CDDIR/boot/grub/efi.img" $CDDIR/efi/boot/boot*.efi \
         "::efi/boot"
-    unset MTOOLS_SKIP_CHECK
 
     # Ugh - different code here depending on the version of xorriso we've got
     if [ $XORRISO_VER -le 10202 ] ; then