Changeset 3436 for branches


Ignore:
Timestamp:
Aug 28, 2015, 3:52:36 PM (4 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:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mondo/src/mondorestore/mondo-prep.c

    r3435 r3436  
    787787log_to_screen(tmp);
    788788mr_free(tmp);
    789 
    790 if (res && strstr(program, "kludge")) {
    791     mr_asprintf(tmp, "Kludge failed; using regular mkfs.%s to format %s", format, device);
    792     mr_free(program);
    793 #ifdef __FreeBSD__
    794     mr_asprintf(program, "newfs_msdos -F 32 %s", device);
    795 #else
    796 #ifdef __IA64__
    797     /* For EFI or UEFI partitions take fat16
    798      * as we want to make small ones */
    799     mr_asprintf(program, "mkfs -t %s -F 16 %s", format, device);
    800 #else
    801     mr_asprintf(program, "mkfs -t %s -F 32 %s", format, device);
    802 #endif
    803 #endif
    804     res = run_program_and_log_output(program, FALSE);
    805     if (g_fprep) {
    806         fprintf(g_fprep, "%s\n", program);
    807     }
    808     mr_free(program);
    809 
    810     if (retval) {
    811         mr_strcat(tmp, "...failed");
    812     } else {
    813         mr_strcat(tmp, "...OK");
    814     }
    815 
    816     log_to_screen(tmp);
    817     mr_free(tmp);
    818 
    819789}
    820790retval += res;
     
    21272097#endif
    21282098} else if (strcmp(format, "vfat") == 0) {
    2129     mr_asprintf(program, "format-and-kludge-vfat");
     2099#ifdef __FreeBSD__
     2100    mr_asprintf(program, "newfs_msdos -F 32");
     2101#else
     2102#ifdef __IA64__
     2103    /* For EFI or UEFI partitions take fat16
     2104     * as we want to make small ones */
     2105    mr_asprintf(program, "mkfs.vfat -F 16");
     2106#else
     2107    mr_asprintf(program, "mkfs.vfat -F 32");
     2108#endif
     2109#endif
    21302110#ifndef __FreeBSD__
    21312111} else if (strcmp(format, "reiserfs") == 0) {
Note: See TracChangeset for help on using the changeset viewer.