Changeset 3472 in MondoRescue

Timestamp:

Sep 29, 2015, 2:26:05 AM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix #778: Use fatlabel to recreate labelled FAT or VFAT FS when that command is available

Location:

branches/3.2

Files:

• mindi/deplist.d/fs.conf (modified) (1 diff)
• mondo/src/mondorestore/mondorestore.c (modified) (2 diffs)
• mondo/src/restore-scripts/mondo/label-partitions-as-necessary (modified) (1 diff)

branches/3.2/mindi/deplist.d/fs.conf

@@ -37 +37 @@
 /sbin/badblocks
 /sbin/btrfsck
+
+# FAT
+/sbin/fatlabel
 
 # ext2/3/4

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

@@ -2036 +2036 @@
 
     /*  if (restore_some || restore_all || */
-    if (ask_me_yes_or_no
-        ("Label/Identify your ext2/ext3/ext4 partitions if necessary?")) {
+    if (ask_me_yes_or_no("Label/Identify your ext2/ext3/ext4 partitions if necessary?")) {
         mvaddstr_and_log_it(g_currentY, 0,
                             "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
@@ -2048 +2047 @@
         mr_free(fstab_fname);
 
-        res = system(tmp1);
+        res = run_program_and_log_output(tmp1, TRUE);
         mr_free(tmp1);
         if (res) {

branches/3.2/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

@@ -56 +56 @@
             LogIt "Running $command"
             $command
+        elif [ "$format" = "fat" ] || [ "$format" = "vfat" ]; then
+            if [ -x "/sbin/fatlabel" ]; then
+                command="/sbin/fatlabel $mountpt $label"
+                LogIt "Running $command"
+                $command
+            else
+                LogIt "No fatlabel command available to label a FAT/VFAT FS"
+            fi
         elif [ "$format" = "swap" ] ; then
             if [ "$opttun" = "-U" ]; then