Changeset 2623 in MondoRescue for branches/2.2.10/mondo/src/common

Timestamp:

Apr 12, 2010, 3:23:24 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3783@localhost: bruno | 2010-04-11 11:57:27 +0200

• Use MINDI_CACHE for temp file communication between archive/restore
• Remove some now useless globals in mondo
• Remove function get_cfg_file_from_archive_or_bust and get_cfg_file_from_archive
• Adds function get_cfg_file_from_initrd (Not finished)
• Recovery doesn't work in that version atm (checkpoint version)

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-archive.c (modified) (1 diff)
• libmondo-devices.c (modified) (2 diffs)
• libmondo-filelist.c (modified) (3 diffs)
• libmondo-files.c (modified) (1 diff)

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

@@ -2203 +2203 @@
     }
 
-    mr_asprintf(command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
-            biggielist);
-    paranoid_system(command);
-    mr_free(command);
-
     mr_asprintf(blah, "biggielist = %s", biggielist);
     log_msg(2, blah);

branches/2.2.10/mondo/src/common/libmondo-devices.c

@@ -54 +54 @@
  * @ingroup globalGroup
  */
-bool g_restoring_live_from_cd = FALSE;
-bool g_restoring_live_from_netfs = FALSE;
-
 extern t_bkptype g_backup_media_type;   // set by main()
 
@@ -2561 +2558 @@
     // Tape, CD, NETFS, ...?
     srandom(getpid());
-    bkpinfo->backup_media_type =
-        (g_restoring_live_from_cd) ? cdr :
-        which_backup_media_type(bkpinfo->restore_data);
+    bkpinfo->backup_media_type = which_backup_media_type(bkpinfo->restore_data);
     if (bkpinfo->backup_media_type == none) {
         log_to_screen("User has chosen not to backup the PC");

branches/2.2.10/mondo/src/common/libmondo-filelist.c

@@ -104 +104 @@
     estimate_noof_media_required(noof_sets);    // for cosmetic purposes
 
-    mr_asprintf(tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(tempfile, "%s/biggielist.txt", bkpinfo->scratchdir);
     if (!(fout = fopen(tempfile, "a"))) {
         log_OS_error("Cannot append to biggielist");
@@ -237 +237 @@
     curr_set_size = 0;
     mr_asprintf(outfname, "%s/filelist.%ld", bkpinfo->tmpdir, curr_set_no);
-    mr_asprintf(biggie_fname, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(biggie_fname, "%s/biggielist.txt", bkpinfo->scratchdir);
     log_it("outfname=%s; biggie_fname=%s", outfname, biggie_fname);
     if (!(fbig = fopen(biggie_fname, "w"))) {
@@ -261 +261 @@
             i = 0;
         }
-        /* Now that we dyn. alloc is truncating needed ?
-        if (i > MAX_STR_LEN - 1) {
-            incoming[MAX_STR_LEN - 30] = '\0';
-            log_msg(1, "Warning - truncating file %s's name", incoming);
-            err++;
-        }
-        */
         if (incoming[i] < 32) {
             incoming[i] = '\0';

branches/2.2.10/mondo/src/common/libmondo-files.c

@@ -754 +754 @@
 
     log_it("Calculating size of all biggiefiles (in total)");
-    mr_asprintf(biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(biggielist, "%s/biggielist.txt", bkpinfo->scratchdir);
     log_it("biggielist = %s", biggielist);
     fin = fopen(biggielist, "r");