Changeset 2462 in MondoRescue for branches/2.2.10/mondo/src/mondorestore

Timestamp:

Oct 20, 2009, 4:07:00 PM (16 years ago)

Author:

Bruno Cornec

Message:

r3548@localhost: bruno | 2009-10-16 19:18:27 +0200

• mindi now boots in a QEMU VM without busybox
• mindi is now noarch as a consequence
• MINDI_LIB becomes MINDI_DATA for coherency and as a consequence
• CACHEDIR becomes MINDI_CACHE for coherency and it's a build parameter and not hardcoded anymore in mindi
• THat variable is also used at restore time for mondorestore.cfg e.g.
• FAILSAFE kernel is gone. Just use another kernel of your choice. Most std kernels work anyway
• TurnTgzIntoRdz rewritten and now really computes data disk size and not suppose its size
• Interface mondo/mindi changed again => incompatible
• Non-bootable media not supported anymore.
• Mondorescue adapted to these changes but not tested yet
• Doc updated as well

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (1 diff)
• mondo-rstr-compare.c (modified) (2 diffs)
• mondo-rstr-tools.c (modified) (9 diffs)
• mondorestore.c (modified) (7 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

@@ -1573 +1573 @@
     if (pout_to_fdisk) {
         // mark relevant partition as bootable
-        tmp1 = call_program_and_get_last_line_of_output ("make-me-bootable /tmp/mountlist.txt dummy");
+        tmp1 = call_program_and_get_last_line_of_output ("make-me-bootable "MINDI_CACHE"/mountlist.txt dummy");
         mr_asprintf(tmp, "a\n%s\n", tmp1);
         mr_free(tmp1);

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -649 +649 @@
     chdir(bkpinfo->restore_path);
 
-    mr_asprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
-    run_program_and_log_output(command, FALSE);
-    mr_free(command);
-
     mvaddstr_and_log_it(g_currentY,
                         0, "Verifying archives against filesystem");
@@ -705 +701 @@
     getcwd(dir, MAX_STR_LEN);
     chdir(bkpinfo->restore_path);
-    mr_asprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
-    run_program_and_log_output(command, FALSE);
-    mr_free(command);
 
     mvaddstr_and_log_it(g_currentY,

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

@@ -26 +26 @@
  * The mountlist stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define MOUNTLIST_FNAME_STUB "tmp/mountlist.txt"
-
-/**
- * The mondo-restore.cfg stub (appended to the directory where all.tar.gz was unpacked).
+#define MOUNTLIST_FNAME_STUB MINDI_CACHE_REL"/mountlist.txt"
+
+/**
+ * The mondorestore.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 MINDI_CACHE_REL"/mondorestore.cfg"
 /**
  * The i-want-my-lvm stub
@@ -157 +157 @@
 
 /**
-* Extract @c mondo-restore.cfg and @c mountlist.txt from @p ramdisk_fname.
+* Extract @c mondorestore.cfg and @c mountlist.txt from @p ramdisk_fname.
 * @param bkpinfo The backup information structure. @c tmpdir is the only field used.
 * @param ramdisk_fname The filename of the @b compressed ramdisk to look in.
@@ -167 +167 @@
 
 /**
-* Keep trying to get mondo-restore.cfg from the archive, until the user gives up.
+* Keep trying to get mondorestore.cfg from the archive, until the user gives up.
 */
 void get_cfg_file_from_archive_or_bust()
@@ -678 +678 @@
 /**
 * Fill out @p bkpinfo based on @p cfg_file.
-* @param cfg_file The mondo-restore.cfg file to read into @p bkpinfo.
+* @param cfg_file The mondorestore.cfg file to read into @p bkpinfo.
 * @param bkpinfo The backup information structure to fill out with information
 * from @p cfg_file.
@@ -1574 +1574 @@
         if (!run_program_and_log_output("which grub-MR", FALSE)) {
             log_msg(1, "Yay! grub-MR found...");
-            mr_asprintf(command, "grub-MR %s /tmp/mountlist.txt", boot_device);
+            mr_asprintf(command, "grub-MR %s "MINDI_CACHE"/mountlist.txt", boot_device);
             log_msg(1, "command = %s", command);
         } else {
@@ -1872 +1872 @@
     } else {
         /* nuke mode */
-        mr_asprintf(command, "raw-MR %s /tmp/mountlist.txt", boot_device);
+        mr_asprintf(command, "raw-MR %s "MINDI_CACHE"/mountlist.txt", boot_device);
         log_msg(2, "run_raw_mbr() --- command='%s'", command);
 
@@ -2128 +2128 @@
 
 /**
- * Extract mondo-restore.cfg and the mountlist from the tape inserted
+ * Extract mondorestore.cfg and the mountlist from the tape inserted
  * to the ./tmp/ directory.
  * @param dev The tape device to read from.
@@ -2261 +2261 @@
             mr_free(tmp);
 
-            if (!does_file_exist("tmp/mondo-restore.cfg")) {
+            if (!does_file_exist(MINDI_CACHE_REL"/mondorestore.cfg")) {
                 log_to_screen("Cannot find config info on media");
                 return (1);
@@ -2345 +2345 @@
     }
 
-    log_to_screen("Recovered mondo-restore.cfg");
+    log_to_screen("Recovered mondorestore.cfg");
     if (!does_file_exist(MOUNTLIST_FNAME_STUB)) {
         log_to_screen("...but not mountlist.txt - a pity, really...");

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -102 +102 @@
 
 /**
- * The location of 'mondo-restore.cfg', containing the metadata
+ * The location of 'mondorestore.cfg', containing the metadata
  * information for this backup.
  */
@@ -162 +162 @@
     assert(raidlist != NULL);
     if (!bkpinfo->disaster_recovery) {
-        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
         log_msg(2, "I guess you're testing edit_mountlist()");
     }
@@ -2074 +2074 @@
 
     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-    log_msg(2, "Insisting on 1st CD, so that I can have a look at LAST-FILELIST-NUMBER");
+    log_msg(2, "Insisting on 1st CD");
     if (g_current_media_number != 1) {
         log_msg(3, "OK, that's jacked up.");
@@ -2695 +2695 @@
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
         if (!does_file_exist(g_mountlist_fname)) {
-            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
         }
         res = let_user_edit_the_mountlist(mountlist, raidlist);
@@ -2795 +2795 @@
         log_msg(0, "Partitioning only.");
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
         load_mountlist(mountlist, g_mountlist_fname);
         res = partition_everything(mountlist);
@@ -2804 +2804 @@
         log_msg(0, "Formatting only.");
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
         load_mountlist(mountlist, g_mountlist_fname);
         res = format_everything(mountlist, FALSE, raidlist);
@@ -2813 +2813 @@
         log_msg(0, "Stopping LVM and RAID");
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
         load_mountlist(mountlist, g_mountlist_fname);
         res = do_my_funky_lvm_stuff(TRUE, FALSE);