From 50b68256b7c1d58066fbfb3e3d39c4c50fb16107 Mon Sep 17 00:00:00 2001
From: Adam Schwalm <adamschwalm@gmail.com>
Date: Sun, 16 Sep 2018 19:45:39 -0500
Subject: [PATCH] Make 'Universal' drive format FAT32

---
 pISO/src/newdrive.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pISO/src/newdrive.rs b/pISO/src/newdrive.rs
index 980e682..018f053 100644
--- a/pISO/src/newdrive.rs
+++ b/pISO/src/newdrive.rs
@@ -337,7 +337,7 @@ impl DriveFormat {
                 utils::run_check_output("mkfs.ntfs", &["-f", &first_part_path])?;
                 utils::run_check_output("ntfslabel", &[&first_part_path, name])?;
             }
-            InitialDriveFormat::MacOs | InitialDriveFormat::Universal => {
+            InitialDriveFormat::MacOs => {
                 utils::run_check_output("mkfs.exfat", &[&first_part_path])?;
                 utils::run_check_output("exfatlabel", &[&first_part_path, name])?;
             }
@@ -345,6 +345,10 @@ impl DriveFormat {
                 utils::run_check_output("mkfs.ext3", &[&first_part_path])?;
                 utils::run_check_output("e2label", &[&first_part_path, name])?;
             }
+            InitialDriveFormat::Universal => {
+                utils::run_check_output("mkfs.msdos", &["-F", "32", "-I", &first_part_path])?;
+                utils::run_check_output("dosfslabel", &[&first_part_path, name])?;
+            }
         };
 
         utils::run_check_output("losetup", &["-d", &loopback_path.to_string_lossy()])?;