Changeset 2623 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

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)

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-prep.c (modified) (7 diffs)

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

@@ -35 +35 @@
 //static char cvsid[] = "$Id$";
 
-extern char *g_mountlist_fname;
 extern long g_current_progress, g_maximum_progress;
 
@@ -72 +71 @@
 // then zero & insist on reboot.
     buf = malloc(blocksize);
-    if (does_file_exist("/tmp/i-want-my-lvm"))  // FIXME - cheating :)
+    if (does_file_exist(MINDI_CACHE"/i-want-my-lvm"))   // FIXME - cheating :)
     {
         drivelist = malloc(sizeof(struct list_of_disks));
@@ -172 +171 @@
  */
 /**
- * Execute the commands in /tmp/i-want-my-lvm.
+ * Execute the commands in MINDI_CACHE"i-want-my-lvm.
  * These should probably be commands to set up LVM.
  * @return The number of errors encountered (0 for success).
@@ -221 +220 @@
     mr_free(tmp);
 
-    if (!(fin = fopen("/tmp/i-want-my-lvm", "r"))) {
-        log_OS_error("/tmp/i-want-my-lvm");
+    if (!(fin = fopen(MINDI_CACHE"/i-want-my-lvm", "r"))) {
+        log_OS_error(MINDI_CACHE"/i-want-my-lvm");
         return (1);
     }
@@ -937 +936 @@
 // do LVMs now
     log_msg(1, "Creating LVMs");
-    if (does_file_exist("/tmp/i-want-my-lvm")) {
+    if (does_file_exist(MINDI_CACHE"/i-want-my-lvm")) {
         wait_until_software_raids_are_prepped("/proc/mdstat", 100);
         log_to_screen("Configuring LVM");
@@ -1861 +1860 @@
     log_msg(0, "Done.");
 
-/*  
-    if (does_file_exist("/tmp/i-want-my-lvm"))
-      {
-        wipe_MBRs_and_reboot_if_necessary(mountlist); // i.e. if it wasn't done recently
-      }
-*/
-
     open_progress_form("Partitioning devices",
                        "I am now going to partition all your drives.",
@@ -2425 +2417 @@
     assert(mountlist != NULL);
 
-    if (g_mountlist_fname[0] == '\0') {
-        log_it
-            ("resize_mountlist_prop...() - warning - mountlist fname is blank");
-        log_it("That does NOT affect the functioning of this subroutine.");
-        log_it("--- Hugo, 2002/11/20");
-    }
     log_it("Resizing mountlist");
     make_list_of_drives_in_mountlist(mountlist, drivelist);