Changeset 1913 in MondoRescue for branches/2.2.6/mondo

Timestamp:

Apr 14, 2008, 2:48:40 PM (16 years ago)

Author:

Bruno Cornec

Message:

Extract of mandatory files is now under ./tmp/.. instead of tmp/.. as we now use ar to create the all.tar.gz

Location:

branches/2.2.6/mondo/src

Files:

• common/libmondo-stream.c (modified) (1 diff)
• common/my-stuff.h (modified) (1 diff)
• mondorestore/mondo-restore.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (5 diffs)

branches/2.2.6/mondo/src/common/libmondo-stream.c

@@ -796 +796 @@
     (void) getcwd(old_cwd, MAX_STR_LEN);
     chdir(bkpinfo->tmpdir);
-    sprintf(tmp, "tar -zxf %s tmp/mondo-restore.cfg 2> /dev/null",
+    sprintf(tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null",
             outfname);
     paranoid_system(tmp);

branches/2.2.6/mondo/src/common/my-stuff.h

@@ -215 +215 @@
  * The biggielist stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define BIGGIELIST_TXT_STUB "tmp/biggielist.txt"
+#define BIGGIELIST_TXT_STUB "./tmp/biggielist.txt"
 
 /**
  * The filelist stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define FILELIST_FULL_STUB "tmp/filelist.full.gz"
+#define FILELIST_FULL_STUB "./tmp/filelist.full.gz"
 
 /**
  * The mountlist stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define MOUNTLIST_FNAME_STUB "tmp/mountlist.txt"
+#define MOUNTLIST_FNAME_STUB "./tmp/mountlist.txt"
 
 /**
  * The mondo-restore.cfg stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg"
+#define MONDO_CFG_FILE_STUB "./tmp/mondo-restore.cfg"
 /**
  * The location where mindi media images are stored.

branches/2.2.6/mondo/src/mondorestore/mondo-restore.c

@@ -2777 +2777 @@
     paranoid_fclose(fout);
     sprintf(command,
-            "tar -zxvf %s tmp/mondo-restore.cfg tmp/mountlist.txt tmp/filelist.full tmp/biggielist.txt",
+            "tar -zxvf %s ./tmp/mondo-restore.cfg ./tmp/mountlist.txt ./tmp/filelist.full ./tmp/biggielist.txt",
             datadisks_fname);
     run_program_and_log_output(command, 4);

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

@@ -1288 +1288 @@
             BIGGIELIST_TXT_STUB,
             FILELIST_FULL_STUB,
-            "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
+            "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
     log_msg(1, "tarcommand = %s", command);
     run_program_and_log_output(command, 1);
@@ -1304 +1304 @@
             BIGGIELIST_TXT_STUB,
             FILELIST_FULL_STUB,
-            "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
+            "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
 
     log_msg(1, "tarcommand = %s", command);
@@ -1311 +1311 @@
     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");
     }
 }
@@ -2278 +2278 @@
             1024L * 1024 * 32 / 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");
     log_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
@@ -2407 +2407 @@
                 log_msg(2,
                         "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
-                sprintf(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
+                sprintf(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);
                 if (!does_file_exist(MONDO_CFG_FILE_STUB)) {