Changeset 3701 in MondoRescue

Timestamp:

Apr 3, 2018, 12:31:02 AM (6 years ago)

Author:

Bruno Cornec

Message:

Workaround #836 by disabling crc on XFS FS at restore time for now.

File:

• branches/3.3/mondo/src/mondorestore/mondo-prep.c (modified) (3 diffs)

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

@@ -787 +787 @@
 
 res = run_program_and_log_output(program, FALSE);
+mr_free(program);
 if (res) {
     mr_strcat(tmp, "...failed");
@@ -794 +795 @@
 log_to_screen(tmp);
 mr_free(tmp);
+
+/*  BR#836: we need to do it a second time if -m wasn't working in that version for XFS */
+if ((res) && (strcmp(format, "xfs") == 0)) {
+    mr_asprintf(program, "sh -c 'echo -en \"y\\ny\\ny\\n\" | mkfs.xfs -f -q %s'", device);
+
+    mr_asprintf(tmp, "Formatting %s as %s", device, format);
+    update_progress_form(tmp);
+
+    res = run_program_and_log_output(program, FALSE);
+    mr_free(program);
+    if (res) {
+        mr_strcat(tmp, "...failed");
+    } else {
+        mr_strcat(tmp, "...OK");
+    }
+    log_to_screen(tmp);
+    mr_free(tmp);
+}
 
 retval += res;
@@ -2129 +2148 @@
     mr_asprintf(program, "mkreiserfs -ff");
 } else if (strcmp(format, "xfs") == 0) {
-    mr_asprintf(program, "mkfs.xfs -f -q");
+    /*  Cf: https://bugzilla.redhat.com/show_bug.cgi?id=1309498 */
+    mr_asprintf(program, "mkfs.xfs -f -q -m crc=0 -n ftype=0");
 } else if (strcmp(format, "jfs") == 0) {
     mr_asprintf(program, "mkfs.jfs");