Changeset 3292 in MondoRescue for branches/3.2/mondo/src/common/libmondo-archive.c

Timestamp:

May 27, 2014, 5:53:14 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Remove from mindi 2 functions replaced by perl code (ReadAllLink by mr-read-all-link and ProcessLDD by mr-process-ldd)
• Redirect mindi execution to mondo log on the fly to try to improve percentage display with newt (not finished yet)
• Introduce a new global var MINDI_LOGFILE and use it everywhere
• Fix some memory free mising (thanks valgrind)
• Remove a call to rpm to log packages - not portable
• Works with valgrind locally to create images in dir

File:

• branches/3.2/mondo/src/common/libmondo-archive.c (modified) (5 diffs)

branches/3.2/mondo/src/common/libmondo-archive.c

@@ -843 +843 @@
     mr_asprintf(command, "mindi %s --custom %s %s/images '%s' '%s' \
 '%s' %ld '%s' '%s' '%s' \
-'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", tmp2, bkpinfo->tmpdir,    // parameter #2
+'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s' 2>&1 > %s", tmp2, bkpinfo->tmpdir,  // parameter #2
             bkpinfo->scratchdir,    // parameter #3
             bkpinfo->kernel_path,   // parameter #4
@@ -864 +864 @@
             use_lzma_sz,        // parameter #20 (STRING)
             value,              // parameter #21 (STRING)
+            MONDO_LOGFILE,      // redirect to log file
             MONDO_LOGFILE);
 
@@ -888 +889 @@
 //  popup_and_OK("Pausing");
 
-    res = run_program_and_log_output(command, FALSE);
+    // BCO old call :
+    //res = run_program_and_log_output(command, FALSE);
+    res = run_external_binary_with_percentage_indicator_NEW("Calling MINDI for boot disk",command);
+    /* May crash now that we changed the call
     update_evalcall_form(99);
+    */
     paranoid_free(command);
 
@@ -929 +934 @@
     } else {
         log_to_screen("Mindi failed to create your boot+data disks.");
-        mr_asprintf(command, "grep 'Fatal error' /var/log/mindi.log");
+        mr_asprintf(command, "grep 'Fatal error' %s", MINDI_LOGFILE);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
@@ -1638 +1643 @@
         mr_free(tmp3);
     }
+    mr_free(tmp);
     mr_free(tmp2);
     mr_free(tmp3);