Changeset 3531 in MondoRescue for branches

Timestamp:

Mar 9, 2016, 6:17:17 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Use mkfs.vfat now everywhere (removes mkdosfs references)
• Avoid using -F 32 to let the mkfs.vfat command choose the best size by itself. Should fix an issue with mr-label with UUIDs and also errors creating bootroot FS with mindi

Location:

branches/3.2

Files:

• mindi/mindi (modified) (3 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (1 diff)

branches/3.2/mindi/mindi

@@ -1698 +1698 @@
 
 LogAll "INFO: Creating a vfat filesystem on $part"
-mkdosfs -F 32 $part 2>&1 >> $LOGFILE
+
+mkfs.vfat $part 2>&1 >> $LOGFILE
 if [ $? -ne 0 ]; then
     LogAll "ERROR: Unable to create a vfat filesystem on $part"
@@ -1764 +1765 @@
     # ISO
     if [ "$BOOT_TYPE" = "BIOS" ]; then
-        # syslinux should be run on a  local file (doen't work through NFS Cf: #297)
+        # syslinux should be run on a local file (doen't work through NFS Cf: #297)
         # and run after the formating for versions > 6 it seems
         syslinux $part >> $LOGFILE 2>> $LOGFILE
@@ -2940 +2941 @@
 LogFile "-----------------------------"
 
-[ -e "/sbin/mkdosfs" ] && [ ! -e "/sbin/mkfs.vfat" ] && LogAll "/sbin/mkfs.vfat is missing!"
-
 # Log some capital variables
 [ "$MINDI_PREFIX" = "XXX" ] && Die "Mindi has not been installed correctly."

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

@@ -2101 +2101 @@
 #else
 #ifdef __IA64__
-    /* For EFI or UEFI partitions take fat16 
+    /* For EFI partitions on ia64 take fat16 
      * as we want to make small ones */
     mr_asprintf(program, "mkfs.vfat -F 16");
 #else
-    mr_asprintf(program, "mkfs.vfat -F 32");
+    /* mkfs.vfat will make the best possible choice itself */
+    /* should avoid problems with mr-label later on when used */
+    mr_asprintf(program, "mkfs.vfat");
 #endif
 #endif