Changeset 1924 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Apr 18, 2008, 1:41:41 AM (16 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1902:1923 $SVN_M/branches/2.2.6

File:

• branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (6 diffs)

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -1118 +1118 @@
                     BIGGIELIST_TXT_STUB,
                     FILELIST_FULL_STUB,
-                    "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
+                    "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
             mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
@@ -1135 +1135 @@
                     BIGGIELIST_TXT_STUB,
                     FILELIST_FULL_STUB,
-                    "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
+                    "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
             mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
@@ -1142 +1142 @@
             if (!does_file_exist(BIGGIELIST_TXT_STUB)) {
                 fatal_error
-                    ("all.tar.gz did not include tmp/biggielist.txt");
+                    ("all.tar.gz did not include ./tmp/biggielist.txt");
             }
             if (!does_file_exist(FILELIST_FULL_STUB)) {
                 fatal_error
-                    ("all.tar.gz did not include tmp/filelist.full.gz");
+                    ("all.tar.gz did not include ./tmp/filelist.full.gz");
             }
         }
@@ -2083 +2083 @@
             1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
             MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
-            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm");
+            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "./tmp/i-want-my-lvm");
     mr_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
@@ -2113 +2113 @@
     char *ramdisk_fname = NULL;
     char *mountlist_file = NULL;
-    int res = 0;
 
     bool try_plan_B = FALSE;
@@ -2205 +2204 @@
                 mr_msg(2,
                         "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
-                mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm"); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
+                mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "./tmp/i-want-my-lvm");   // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                 run_program_and_log_output(command, TRUE);
                 mr_free(command);