Changeset 2299 in MondoRescue for branches

Timestamp:

Jul 23, 2009, 6:20:05 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Backport a bug fix from 2.2.9 around messages displayed when formating partitions

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-prep.c (modified) (9 diffs)

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

@@ -690 +690 @@
         mr_asprintf(&tmp, "Not formatting %s (it is a RAID disk)", device);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (0);
     }
@@ -702 +702 @@
         mr_asprintf(&tmp, "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it", device, format);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (0);
     }
@@ -708 +708 @@
         mr_asprintf(&tmp, "%s is mounted - cannot format it       ", device);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (1);
     }
@@ -738 +738 @@
             mr_asprintf(&tmp, "Initializing Vinum device %s (this may take a *long* time)", device);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             /* format raid partition */
@@ -755 +755 @@
                 mr_asprintf(&tmp, "Initializing plex: %s", line);
                 open_evalcall_form(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
 
                 mr_asprintf(&tmp, "vinum init %s", line);
                 system(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
 
                 while (1) {
                     mr_asprintf(&tmp, "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'", line);
                     FILE *pin = popen(tmp, "r");
-                    paranoid_free(tmp);
+                    mr_free(tmp);
 
                     char status[MAX_STR_LEN / 4];
@@ -780 +780 @@
             fclose(fin);
             unlink("/tmp/plexes");
-            /* retval+=res; */
         }
 #else
         mr_asprintf(&tmp, "Initializing RAID device %s", device);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
 // Shouldn't be necessary.
@@ -820 +819 @@
     if (!strcmp(format, "lvm")) {
         log_msg(1, "Don't format %s - it's part of an lvm volume", device);
-        paranoid_free(tmp);
         return (0);
     }
@@ -831 +829 @@
 
     mr_asprintf(&program, "sh -c 'echo -en \"y\\ny\\ny\\n\" | %s'", tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     mr_asprintf(&tmp, "Formatting %s as %s", device, format);
     update_progress_form(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     res = run_program_and_log_output(program, FALSE);
-    mr_asprintf(&tmp, "");
+    if (res) {
+        mr_strcat(tmp, "...failed");
+    } else {
+        mr_strcat(tmp, "...OK");
+    }
+    log_to_screen(tmp);
+    mr_free(tmp);
+
     if (res && strstr(program, "kludge")) {
-        mr_strcat(tmp, "Kludge failed; using regular mkfs.%s to format %s",
-                format, device);
+        mr_asprintf(&tmp, "Kludge failed; using regular mkfs.%s to format %s", format, device);
         mr_free(program);
 #ifdef __FreeBSD__
@@ -858 +862 @@
             fprintf(g_fprep, "%s\n", program);
         }
+        if (retval) {
+            mr_strcat(tmp, "...failed");
+        } else {
+            mr_strcat(tmp, "...OK");
+        }
+
+        log_to_screen(tmp);
+        mr_free(tmp);
+
     }
     mr_free(program);
     retval += res;
-    if (retval) {
-        mr_strcat(tmp, "...failed");
-    } else {
-        mr_strcat(tmp, "...OK");
-    }
-
-    log_to_screen(tmp);
-    mr_free(tmp);
-
     system("sync");
     sleep(1);