Changeset 2601 in MondoRescue

Timestamp:

Mar 22, 2010, 1:56:17 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3755@localhost: bruno | 2010-03-16 22:03:43 +0100

• Fix incorrect usage of all.tar.gz at restore time.

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (3 diffs)

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

@@ -844 +844 @@
         mr_free(command);
 
-        if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(command, "cp -f %s/all.tar.gz %s/images", bkpinfo->tmpdir, bkpinfo->scratchdir);
-            if (system(command)) {
-                mr_free(command);
-                fatal_error("Unable to create temporary all tarball");
-            }
+        mr_asprintf(command, "cp -f /%s/all.tar.gz %s/images", MINDI_CACHE_REL, bkpinfo->scratchdir);
+        if (system(command)) {
             mr_free(command);
-        }
+            fatal_error("Unable to create temporary all tarball");
+        }
+        mr_free(command);
+
         /* For USB we already have everything on the key */
         if (bkpinfo->backup_media_type == usb) {
@@ -857 +856 @@
             run_program_and_log_output(command, FALSE);
             mr_free(command);
-        } else {
-            mr_asprintf(tmp, "cp -f /%s/all.tar.gz %s", MINDI_CACHE_REL, bkpinfo->tmpdir);
-            if (system(tmp)) {
-                mr_free(tmp);
-                fatal_error("Cannot find all.tar.gz in tmpdir");
-            }
-            mr_free(tmp);
         }
         if (res) {
@@ -1130 +1122 @@
 
     assert(bkpinfo != NULL);
-    mr_asprintf(data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
+    mr_asprintf(data_disks_file, "/%s/all.tar.gz", MINDI_CACHE_REL);
 
     g_serial_string = call_program_and_get_last_line_of_output("dd  if=/dev/urandom bs=16 count=1 2> /dev/null |  hexdump | tr -s ' ' '0' | head -n1");