Changeset 3436 in MondoRescue

Timestamp:

Aug 28, 2015, 3:52:36 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Use now mkfs.vfat directly for formating VFAT type of partitions and remove the usage of format-and-kludge-vfat completely buggy !

Location:

branches/3.2/mondo/src

Files:

• mondorestore/mondo-prep.c (modified) (2 diffs)
• restore-scripts/mondo/format-and-kludge-vfat (deleted)

branches/3.2/mondo/src/mondorestore/mondo-prep.c

@@ -787 +787 @@
 log_to_screen(tmp);
 mr_free(tmp);
-
-if (res && strstr(program, "kludge")) {
-    mr_asprintf(tmp, "Kludge failed; using regular mkfs.%s to format %s", format, device);
-    mr_free(program);
-#ifdef __FreeBSD__
-    mr_asprintf(program, "newfs_msdos -F 32 %s", device);
-#else
-#ifdef __IA64__
-    /* For EFI or UEFI partitions take fat16 
-     * as we want to make small ones */
-    mr_asprintf(program, "mkfs -t %s -F 16 %s", format, device);
-#else
-    mr_asprintf(program, "mkfs -t %s -F 32 %s", format, device);
-#endif
-#endif
-    res = run_program_and_log_output(program, FALSE);
-    if (g_fprep) {
-        fprintf(g_fprep, "%s\n", program);
-    }
-    mr_free(program);
-
-    if (retval) {
-        mr_strcat(tmp, "...failed");
-    } else {
-        mr_strcat(tmp, "...OK");
-    }
-
-    log_to_screen(tmp);
-    mr_free(tmp);
-
 }
 retval += res;
@@ -2127 +2097 @@
 #endif
 } else if (strcmp(format, "vfat") == 0) {
-    mr_asprintf(program, "format-and-kludge-vfat");
+#ifdef __FreeBSD__
+    mr_asprintf(program, "newfs_msdos -F 32");
+#else
+#ifdef __IA64__
+    /* For EFI or UEFI partitions take fat16 
+     * as we want to make small ones */
+    mr_asprintf(program, "mkfs.vfat -F 16");
+#else
+    mr_asprintf(program, "mkfs.vfat -F 32");
+#endif
+#endif
 #ifndef __FreeBSD__
 } else if (strcmp(format, "reiserfs") == 0) {