From 4bd4cd5a8e2a59e94f2c7bca61bc9891e9264ac0 Mon Sep 17 00:00:00 2001
From: David Michael <dm0@redhat.com>
Date: Sun, 10 Feb 2019 02:44:01 +0000
Subject: [PATCH] disk_util: Add -I for mkfs.vfat

When loop device partition nodes aren't cleaned up, building images
will fail with:

mkfs.vfat: Partitions or virtual mappings on device '/dev/loop0', not making filesystem (use -I to override)

Just add the flag unconditionally to work around it.
---
 build_library/disk_util | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_library/disk_util b/build_library/disk_util
index 9c400c1cab..0e79976860 100755
--- a/build_library/disk_util
+++ b/build_library/disk_util
@@ -420,7 +420,7 @@ def FormatFat(part, device):
   vfat_block_size = 1024
   vfat_blocks = part['bytes'] // vfat_block_size
 
-  cmd = ['mkfs.vfat']
+  cmd = ['mkfs.vfat', '-I']
   if 'fs_label' in part:
     cmd += ['-n', part['fs_label']]
   if part['type'] == 'efi':