From fdf8cc2cdab1bb3f1745a1635ba98cbcd452d2ba Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@redhat.com>
Date: Thu, 12 Apr 2018 17:00:28 -0400
Subject: [PATCH] Revert "Revert "disk_util: use FAT32 on ESP""

FAT32 seemed to aggravate https://github.com/coreos/bugs/issues/2284, but
now that that issue has been addressed, we can return to the correct
filesystem type.

This reverts commit 299f8fb3d10f00b46990bc582b2ba950d8408f11.
---
 build_library/disk_util | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build_library/disk_util b/build_library/disk_util
index a4a72b34d5..9c400c1cab 100755
--- a/build_library/disk_util
+++ b/build_library/disk_util
@@ -423,6 +423,9 @@ def FormatFat(part, device):
   cmd = ['mkfs.vfat']
   if 'fs_label' in part:
     cmd += ['-n', part['fs_label']]
+  if part['type'] == 'efi':
+    # ESP is FAT32 irrespective of size
+    cmd += ['-F', '32']
   Sudo(cmd + [device, vfat_blocks], stdout_null=True)