From 66a696aa3b4b31fd6b351a7e4695ffc5d549bc97 Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Thu, 28 Apr 2016 13:09:15 +1000
Subject: [PATCH] BUG: Fix mtools check errors reported by brchan on thinkpads
 forum It seems that mtools behaves differently with different versions and
 that some versions react badly to the FAT16 image used in the Lenovo ISO
 updates.

    mcopy -o -i g5uj28us.iso@@71680 g5uj28us.iso.bat ::AUTOEXEC.BAT
    Total number of sectors (64195) not a multiple of sectors per track (32)!
    Add mtools_skip_check=1 to your .mtoolsrc file to skip this test

adding the skip_check environment variable simply ignores this error...
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7f27527..429361c 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ $(DEPSDIR)/slice.insert.deps: Makefile
 
 # If we ever want a copy of the dosflash.exe, just get it from the iso image
 %.dosflash.exe.orig: %.iso.orig
-	mcopy -i $^@@$(FAT_OFFSET) ::FLASH/DOSFLASH.EXE $@
+	MTOOLS_SKIP_CHECK=1 mcopy -i $^@@$(FAT_OFFSET) ::FLASH/DOSFLASH.EXE $@
 
 mec-tools/Makefile:
 	git submodule update --init --remote
@@ -136,7 +136,7 @@ endef
 # $1 = FL2 filename
 # $2 = ISO image
 define rule_iso
-    $(2): $(1) $(2).bat ; ./slice.insert $(1).slice $(1) $(2) && mcopy -o -i $(2)@@$(FAT_OFFSET) $(2).bat ::AUTOEXEC.BAT
+    $(2): $(1) $(2).bat ; ./slice.insert $(1).slice $(1) $(2) && MTOOLS_SKIP_CHECK=1 mcopy -o -i $(2)@@$(FAT_OFFSET) $(2).bat ::AUTOEXEC.BAT
 endef
 
 #