Changeset 2623 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondorestore.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/mondorestore.c (modified) (27 diffs)

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

@@ -79 +79 @@
 
 /**
- * The location of 'biggielist.txt', containing the biggiefiles on the current archive set.
- */
-char *g_biggielist_txt;
-
-/**
  * The location of 'filelist.full', containing all files (<em>including biggiefiles</em>) on
  * the current archive set.
@@ -100 +95 @@
  */
 char *g_imagedevs_restthese;
-
-/**
- * The location of 'mondorestore.cfg', containing the metadata
- * information for this backup.
- */
-char *g_mondo_cfg_file;
-
-/**
- * The location of 'mountlist.txt', containing the information on the
- * user's partitions and hard drives.
- */
-char *g_mountlist_fname;
 
 /**
@@ -161 +144 @@
     assert(mountlist != NULL);
     assert(raidlist != NULL);
-    if (!bkpinfo->disaster_recovery) {
-        strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
-        log_msg(2, "I guess you're testing edit_mountlist()");
-    }
-    if (!does_file_exist(g_mountlist_fname)) {
-        log_to_screen(g_mountlist_fname);
-        log_to_screen("does not exist");
+    if (!does_file_exist(MINDI_CACHE"/mountlist.txt")) {
+        log_to_screen(MINDI_CACHE"/mountlist.txt doesn't exist");
         return (1);
     }
 
-    retval = load_mountlist(mountlist, g_mountlist_fname);
+    retval = load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt");
     load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
     if (retval) {
@@ -177 +155 @@
             ("Warning - load_raidtab_into_raidlist returned an error");
     }
-    res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
+    res = edit_mountlist(MINDI_CACHE"/mountlist.txt", mountlist, raidlist);
     if (res) {
         return (1);
     }
 
-    save_mountlist_to_disk(mountlist, g_mountlist_fname);
+    save_mountlist_to_disk(mountlist, MINDI_CACHE"/mountlist.txt");
     save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
 
@@ -466 +444 @@
 
     log_it("About to load config file");
-    get_cfg_file_from_archive_or_bust();
-    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
+    read_cfg_file_into_bkpinfo(MINDI_CACHE"/mondorestore.cfg");
     log_it("Done loading config file; resizing ML");
 
@@ -481 +458 @@
         log_it("About to edit mountlist");
         if (g_text_mode) {
-            save_mountlist_to_disk(mountlist, g_mountlist_fname);
-            mr_asprintf(tmp1, "%s %s", find_my_editor(), g_mountlist_fname);
+            save_mountlist_to_disk(mountlist, MINDI_CACHE"/mountlist.txt");
+            mr_asprintf(tmp1, "%s %s", find_my_editor(), MINDI_CACHE"/mountlist.txt");
             res = system(tmp1);
             mr_free(tmp1);
-            load_mountlist(mountlist, g_mountlist_fname);
+            load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt");
         } else {
-            res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
+            res = edit_mountlist(MINDI_CACHE"/mountlist.txt", mountlist, raidlist);
         }
         log_it("Finished editing mountlist");
@@ -494 +471 @@
         }
         log_msg(2, "Proceeding...");
-        save_mountlist_to_disk(mountlist, g_mountlist_fname);
+        save_mountlist_to_disk(mountlist, MINDI_CACHE"/mountlist.txt");
         save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
         mvaddstr_and_log_it(1, 30, "Restoring Interactively");
@@ -646 +623 @@
             mr_asprintf(fstab_fname, "/tmp/fstab");
         }
-        mr_asprintf(tmp1, "label-partitions-as-necessary %s < %s >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
+        mr_asprintf(tmp1, "label-partitions-as-necessary %s < %s >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
         mr_free(fstab_fname);
 
@@ -762 +739 @@
 
     log_msg(2, "nuke_mode --- starting");
-
-    get_cfg_file_from_archive_or_bust();
-    load_mountlist(mountlist, g_mountlist_fname);   // in case read_cfg_file_into_bkpinfo updated the mountlist
+    load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt"); // in case read_cfg_file_into_bkpinfo updated the mountlist
 
     tmp = call_program_and_get_last_line_of_output("cat " CMDLINE);
@@ -788 +763 @@
     }
 
-    save_mountlist_to_disk(mountlist, g_mountlist_fname);
+    save_mountlist_to_disk(mountlist, MINDI_CACHE"/mountlist.txt");
     mvaddstr_and_log_it(1, 30, "Restoring Automatically");
     if (bkpinfo->differential) {
@@ -862 +837 @@
                         "Using tune2fs to identify your ext2,3 partitions");
 
-    mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab", g_mountlist_fname);
+    mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab", MINDI_CACHE"/mountlist.txt");
     res = run_program_and_log_output(tmp, TRUE);
     mr_free(tmp);
@@ -927 +902 @@
     mr_free(bkpinfo->restore_path);
     mr_asprintf(bkpinfo->restore_path, "/");
-    if (!g_restoring_live_from_cd && !g_restoring_live_from_netfs) {
+    if (bkpinfo->backup_media_type != netfs) {
         popup_and_OK
             ("Please insert tape/CD/USB Key, then hit 'OK' to continue.");
         sleep(1);
-    }
-    if (!g_restoring_live_from_netfs) {
         interactively_obtain_media_parameters_from_user(FALSE);
     }
@@ -945 +918 @@
 
     open_evalcall_form("Thinking...");
-
-    get_cfg_file_from_archive_or_bust();
-    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
-    load_mountlist(mountlist, g_mountlist_fname);   // in case read_cfg_file_into_bkpinfo 
+    read_cfg_file_into_bkpinfo(MINDI_CACHE"/mondorestore.cfg");
+    load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt"); // in case read_cfg_file_into_bkpinfo 
 
     close_evalcall_form();
-    retval = load_mountlist(mountlist, g_mountlist_fname);
+    retval = load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt");
     load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
 
-    if (!g_restoring_live_from_netfs && (filelist = process_filelist_and_biggielist())) {
+    if ((bkpinfo->backup_media_type != netfs) && (filelist = process_filelist_and_biggielist())) {
         save_filelist(filelist, "/tmp/selected-files.txt");
         mr_asprintf(old_restpath, "%s", bkpinfo->restore_path);
@@ -1945 +1916 @@
     }
 
-    tmp1 = read_cfg_var(g_mondo_cfg_file, "total-slices");
+    tmp1 = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "total-slices");
     total_slices = atol(tmp1);
     mr_free(tmp1);
@@ -2080 +2051 @@
     }
     insist_on_this_cd_number(g_current_media_number);
-    tmp1 = read_cfg_var(g_mondo_cfg_file, "last-filelist-number");
+    tmp1 = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "last-filelist-number");
     max_val = atol(tmp1) + 1;
     mr_free(tmp1);
@@ -2219 +2190 @@
     assert(bkpinfo != NULL);
 
-    tmp1 = read_cfg_var(g_mondo_cfg_file, "total-slices");
+    tmp1 = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "total-slices");
     total_slices = atol(tmp1);
     mr_free(tmp1);
@@ -2375 +2346 @@
     assert(bkpinfo != NULL);
     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-    tmp = read_cfg_var(g_mondo_cfg_file, "last-filelist-number");
+    tmp = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "last-filelist-number");
     max_val = atol(tmp) + 1;
     mr_free(tmp);
@@ -2649 +2620 @@
     g_kernel_version = get_kernel_version();
 
-    log_msg(1, "FYI - g_mountlist_fname = %s", g_mountlist_fname);
-    if (strlen(g_mountlist_fname) < 3) {
-        fatal_error("Serious error in malloc()'ing. Could be a bug in your glibc.");
-    }
+    log_msg(1, "FYI - mountlist = %s", MINDI_CACHE"/mountlist.txt");
     mkdir(MNT_CDROM, 0x770);
     make_hole_for_dir(MONDO_CACHE);
 
     /* Backup original mountlist.txt */
-    mr_asprintf(tmp, "%s.orig", g_mountlist_fname);
-    if (!does_file_exist(g_mountlist_fname)) {
-        log_msg(2, "%ld: Warning - g_mountlist_fname (%s) does not exist yet", __LINE__, g_mountlist_fname);
-    } else if (!does_file_exist(tmp)) {
-        mr_free(tmp);
-        mr_asprintf(tmp, "cp -f %s %s.orig", g_mountlist_fname, g_mountlist_fname);
-        run_program_and_log_output(tmp, FALSE);
-    }
+    mr_asprintf(tmp, "cp -f "MINDI_CACHE"/mountlist.txt "MINDI_CACHE"/mountlist.txt.orig");
+    run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
 
@@ -2694 +2656 @@
 #endif
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-        if (!does_file_exist(g_mountlist_fname)) {
-            strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
-        }
         res = let_user_edit_the_mountlist(mountlist, raidlist);
 #ifdef __FreeBSD__
@@ -2795 +2754 @@
         log_msg(0, "Partitioning only.");
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-        strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
-        load_mountlist(mountlist, g_mountlist_fname);
+        load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt");
         res = partition_everything(mountlist);
         finish(res);
@@ -2804 +2762 @@
         log_msg(0, "Formatting only.");
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-        strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
-        load_mountlist(mountlist, g_mountlist_fname);
         res = format_everything(mountlist, FALSE, raidlist);
         finish(res);
@@ -2813 +2769 @@
         log_msg(0, "Stopping LVM and RAID");
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-        strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
-        load_mountlist(mountlist, g_mountlist_fname);
+        load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt");
         res = do_my_funky_lvm_stuff(TRUE, FALSE);
         res += stop_all_raid_devices(mountlist);
@@ -2820 +2775 @@
     }
 
-    if ((argc > 1 && strcmp(argv[argc - 1], "--live-from-cd") == 0) && (!bkpinfo->disaster_recovery)) {
-        g_restoring_live_from_cd = TRUE;
-    }
-
     // Handle params here first
     handle_incoming_parameters(argc,argv);
@@ -2829 +2780 @@
     if (!bkpinfo->disaster_recovery) {  // live!
         log_msg(1, "I am in normal, live mode.");
-        log_msg(2, "FYI, MOUNTLIST_FNAME = %s", g_mountlist_fname);
         mount_boot_if_necessary();  /* for Gentoo users */
         log_msg(2, "Still here.");
-        if (bkpinfo->backup_media_type == netfs) {
-            g_restoring_live_from_netfs = TRUE;
-        }
         /* Adding an initialisation in order to avoid to hndle NULL pointer later */
         mr_free(bkpinfo->restore_path);
@@ -2853 +2800 @@
         /* Disaster recovery mode (must be) */
         log_msg(1, "I must be in disaster recovery mode.");
-        log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
 
         log_it("About to call load_mountlist and load_raidtab");
         mr_free(bkpinfo->restore_path);
         mr_asprintf(bkpinfo->restore_path, "%s", MNT_RESTORING);
-        read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
-        retval = load_mountlist(mountlist, g_mountlist_fname);
+        read_cfg_file_into_bkpinfo(MINDI_CACHE"/mondorestore.cfg");
+        retval = load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt");
         retval += load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
         log_it("Returned from calling load_mountlist and load_raidtab successfully");
@@ -2865 +2811 @@
         // BCO:To be reviewed
         if ((bkpinfo->restore_mode == compare) || (bkpinfo->restore_mode == nuke)) {
-            if (bkpinfo->backup_media_type == netfs && bkpinfo->netfs_mount && !is_this_device_mounted(bkpinfo->netfs_mount)) {
+            if ((bkpinfo->backup_media_type == netfs) && bkpinfo->netfs_mount && !is_this_device_mounted(bkpinfo->netfs_mount)) {
                 log_msg(1, "Mounting remote %s dir", bkpinfo->netfs_proto);
                 mr_free(bkpinfo->isodir);
@@ -3011 +2957 @@
 
     unlink("/tmp/filelist.full");
-    unlink("/tmp/filelist.full.gz");
 
     exit(retval);