From: Michael Prokop <mika@grml.org>
Date: Wed, 3 Jun 2020 13:11:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/35'
X-Git-Tag: v0.18.1~1
X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=67809e1cd9690cbd9f12fde6f20775e24df8548d;hp=fcf63b74e77193db1cc5e797e79f20736de23222

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

diff --git a/grml2usb b/grml2usb
index 867bea0..6a8ada2 100755
--- a/grml2usb
+++ b/grml2usb
@@ -1881,10 +1881,6 @@ def install_grml(mountpoint, device):
         register_tmpfile(device_mountpoint)
         remove_device_mountpoint = True
         try:
-            check_for_fat(device)
-            if not options.skipbootflag:
-                check_boot_flag(device)
-
             set_rw(device)
             mount(device, device_mountpoint, ["-o", "utf8,iocharset=iso8859-1"])
         except CriticalException:
@@ -2169,6 +2165,9 @@ def main():
         # provide upgrade path
         handle_compat_warning(device)
 
+        if not options.skipbootflag:
+            check_boot_flag(device)
+
         # check for vfat partition
         handle_vfat(device)