Make 'Universal' drive format FAT32

ALSchwalm · ALSchwalm · commit 50b68256b7c1 · 2018-09-18T21:53:20.000-05:00
diff --git a/pISO/src/newdrive.rs b/pISO/src/newdrive.rs
@@ -337,14 +337,18 @@ 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])?;
             }
             InitialDriveFormat::Linux => {
                 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()])?;

Original file line number	Diff line number	Diff line change
`@@ -337,14 +337,18 @@ impl DriveFormat {`
`337`	`337`	`utils::run_check_output("mkfs.ntfs", &["-f", &first_part_path])?;`
`338`	`338`	`utils::run_check_output("ntfslabel", &[&first_part_path, name])?;`
`339`	`339`	`}`
`340`		`- InitialDriveFormat::MacOs \| InitialDriveFormat::Universal => {`
	`340`	`+ InitialDriveFormat::MacOs => {`
`341`	`341`	`utils::run_check_output("mkfs.exfat", &[&first_part_path])?;`
`342`	`342`	`utils::run_check_output("exfatlabel", &[&first_part_path, name])?;`
`343`	`343`	`}`
`344`	`344`	`InitialDriveFormat::Linux => {`
`345`	`345`	`utils::run_check_output("mkfs.ext3", &[&first_part_path])?;`
`346`	`346`	`utils::run_check_output("e2label", &[&first_part_path, name])?;`
`347`	`347`	`}`
	`348`	`+ InitialDriveFormat::Universal => {`
	`349`	`+ utils::run_check_output("mkfs.msdos", &["-F", "32", "-I", &first_part_path])?;`
	`350`	`+ utils::run_check_output("dosfslabel", &[&first_part_path, name])?;`
	`351`	`+ }`
`348`	`352`	`};`
`349`	`353`
`350`	`354`	`utils::run_check_output("losetup", &["-d", &loopback_path.to_string_lossy()])?;`