Changeset 3399 in MondoRescue

Timestamp:

Aug 5, 2015, 6:20:52 AM (9 years ago)

Author:

Bruno Cornec

Message:

Fix mindi/mondoarchive interface

Location:

branches/3.2

Files:

• mindi/mindi (modified) (3 diffs)
• mondo/src/common/libmondo-archive.c (modified) (2 diffs)

branches/3.2/mindi/mindi

@@ -1964 +1964 @@
     [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
 
-    cp `dirname $kernelpath`/*.efi $mountpoint 2>> $LOGFILE
+    #cp `dirname $kernelpath`/*.efi $mountpoint 2>> $LOGFILE
     umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
     echo -en "..."
@@ -2596 +2596 @@
     LogIt "INFO: Analyzing perl modules dependencies" $MINDI_TMP/$$.log
     mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` /usr/[s]*bin/mr-* 2>> $MINDI_TMP/$$.log > $MINDI_TMP/perl.lis
-    LogIt "DBG4: Modules found:" $MINDI_TMP/$$.log
-    LogIt "--------------------" $MINDI_TMP/$$.log
+    LogIt "DBG4: Perl Modules found:" $MINDI_TMP/$$.log
+    LogIt "-------------------------" $MINDI_TMP/$$.log
     cat $MINDI_TMP/perl.lis >> $MINDI_TMP/$$.log
-    LogIt "--------------------" $MINDI_TMP/$$.log
+    LogIt "-------------------------" $MINDI_TMP/$$.log
     tar cf - `cat $MINDI_TMP/perl.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in perl scripts analysis" $MINDI_TMP/$$.log
 
@@ -3325 +3325 @@
 if [ -f $MINDI_TMP/$MRCFG ]; then
     LogIt "INFO: Your $MRCFG file is:"
+    LogIt "--------------------------"
     cat $MINDI_TMP/$MRCFG >> $LOGFILE
+    LogIt "--------------------------"
 else
     LogIt "ERROR: You don't have a $MRCFG file !"

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

@@ -838 +838 @@
     update_evalcall_form(3);
 
-/*     "mindi --custom 2=%s 3=%s/images 4=\"%s\" 5=\"%s\" \
-6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
-11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
-    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' '%s' 2>&1 > %s", 
-            //     1           2   3          4   5    6     7     8    9   10   11   12   13    14   15   16   17   18    19   20   21         23
-            tmp2, 
+    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' '%s' '%s' '%s' 2>&1 > %s", 
+            //          1           2   3          4   5    6     7     8    9   10   11   12   13    14   15   16   17   18    19   20   21  22    23         24
+            tmp2,           // parameter #1
             bkpinfo->tmpdir,    // parameter #2
             bkpinfo->scratchdir,    // parameter #3
@@ -851 +847 @@
             tape_size_sz,       // parameter #6
             lines_in_filelist,  // parameter #7 (INT)
-            use_lzo_sz,         // parameter #8
+            use_lzo_sz,     // parameter #8
             cd_recovery_sz,     // parameter #9
-            (bkpinfo->image_devs == NULL) ? "\"\"" : bkpinfo->image_devs,   // parameter #10
+            (bkpinfo->image_devs == NULL) ? "\"\"" : bkpinfo->image_devs,   
+                        // parameter #10
             broken_bios_sz,     // parameter #11
             last_filelist_number,   // parameter #12 (STRING)
-            estimated_total_noof_slices,    // parameter #13 (INT)
-            (bkpinfo->exclude_devs == NULL) ? "\"\"" : bkpinfo->exclude_devs,   // parameter #14
+            estimated_total_noof_slices,    
+                        // parameter #13 (INT)
+            (bkpinfo->exclude_devs == NULL) ? "\"\"" : bkpinfo->exclude_devs,   
+                        // parameter #14
             use_comp_sz,        // parameter #15
             use_lilo_sz,        // parameter #16
             use_star_sz,        // parameter #17
-            bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
+            bkpinfo->internal_tape_block_size,  
+                        // parameter #18 (LONG)
             bkpinfo->differential,  // parameter #19 (INT)
             use_gzip_sz,        // parameter #20 (STRING)
             use_lzma_sz,        // parameter #21 (STRING)
-            value,          // parameter #22 (STRING)
+            value,          // parameter #22 (STRING) backup media type
             boot_type,      // parameter #23 (STRING)
-            MONDO_LOGFILE       // redirect to log file
+            MONDO_LOGFILE       // redirect to log file (#24)
             );