Changeset 2623 in MondoRescue

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)

Location:

branches/2.2.10

Files:

• mindi/README.bootparam (modified) (1 diff)
• mindi/mindi (modified) (1 diff)
• mindi/rootfs/sbin/init (modified) (4 diffs)
• mondo-doc/mondorescue-howto.sgml (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (2 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (3 diffs)
• mondo/src/common/libmondo-files.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-prep.c (modified) (7 diffs)
• mondo/src/mondorestore/mondo-restore-EXT.h (modified) (2 diffs)
• mondo/src/mondorestore/mondo-rstr-compare.c (modified) (5 diffs)
• mondo/src/mondorestore/mondo-rstr-tools-EXT.h (modified) (2 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (28 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.h (modified) (2 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (27 diffs)
• mondo/src/mondorestore/mr-externs.h (modified) (3 diffs)
• mondo/test/test-mountlist.c (modified) (3 diffs)
• mondo/test/test-truncname.c (modified) (1 diff)

branches/2.2.10/mindi/README.bootparam

@@ -28 +28 @@
 
 excludedevs="dev1 dev2"
-    Exclude those evices from retoration process (no LVM action done suc has pvcreate, and no partitioning. Those devices are removed from /tmp/mountlist.txt and /tmp/i-want-my-lvm)
+    Exclude those evices from retoration process (no LVM action done suc has pvcreate, and no partitioning. Those devices are removed from /var/cache/mindi/mountlist.txt and /var/cache/mindi/i-want-my-lvm)
 
 forcemods="mod1 mod2"

branches/2.2.10/mindi/mindi

@@ -1847 +1847 @@
     mkdir -p $bigdir/tmp
     if [ $LVM != "false" ]; then
-        $MINDI_DATA/analyze-my-lvm > $bigdir/tmp/i-want-my-lvm 
+        $MINDI_DATA/analyze-my-lvm > $bigdir$MINDI_CACHE/i-want-my-lvm 
         if [ "$?" -ne "0" ]; then
             LVM="false"
-            rm -f $bigdir/tmp/i-want-my-lvm
+            rm -f $bigdir$MINDI_CACHE/i-want-my-lvm
         else
             LogFile "Your i-want-my-lvm file content is:"
             LogFile "-----------------------------------"
-            cat  $bigdir/tmp/i-want-my-lvm >> $LOGFILE
+            cat  $bigdir$MINDI_CACHE/i-want-my-lvm >> $LOGFILE
             LogFile "-----------------------------------"
         fi
-    fi
-
-    if [ _"$MONDO_SHARE" != _"" ]; then
-        for q in filelist.full.gz biggielist.txt ; do
-            [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
-            cp -pRdf $MINDI_TMP/$q $bigdir/tmp 2>> $LOGFILE
-        done
     fi
 

branches/2.2.10/mindi/rootfs/sbin/init

@@ -371 +371 @@
         return;
     fi
-    if [ -e "/tmp/i-want-my-lvm" ] ; then
+    if [ -e "$MINDI_CACHE/i-want-my-lvm" ] ; then
         LogIt "Scanning LVM's..." 1
         if which lvm ; then
@@ -385 +385 @@
         for d in $MINDI_EXCLUDE_DEVS ; do
             echo "LVM exclusion == $d"
-            EXCLUDE_VGS=`grep " $d" /tmp/i-want-my-lvm | grep vgcreate | awk '{print $4}'`
+            EXCLUDE_VGS=`grep " $d" $MINDI_CACHE/i-want-my-lvm | grep vgcreate | awk '{print $4}'`
             vg=`echo $EXCLUDE_VGS | sed "s/ /|/g"`
             if [ "$vg" != "" ]; then
@@ -393 +393 @@
             fi
             # Remove VGs from i-want-my-lvm
-            grep -Ev "$re" /tmp/i-want-my-lvm > /tmp/i-want-my-lvm.new
-            mv /tmp/i-want-my-lvm.new /tmp/i-want-my-lvm
+            grep -Ev "$re" $MINDI_CACHE/i-want-my-lvm > $MINDI_CACHE/i-want-my-lvm.new
+            mv $MINDI_CACHE/i-want-my-lvm.new $MINDI_CACHE/i-want-my-lvm
             # Prepare  script to restore the VG exluded here if needed
             for v in $EXCLUDE_VGS; do
                 echo "vgcfgrestore $v" >> /tmp/restorevgs
                 # Remove LVs from mountlist
-                EXCLUDE_LVS=`grep " $v" /tmp/i-want-my-lvm | grep lvcreate | sed "s/^.*-n \([^ ][^ ]*\) .*$/$1/"`
+                EXCLUDE_LVS=`grep " $v" $MINDI_CACHE/i-want-my-lvm | grep lvcreate | sed "s/^.*-n \([^ ][^ ]*\) .*$/$1/"`
                 for l in $EXCLUDE_LVS; do
                     # FIXME: Should search for all possible device names here
@@ -408 +408 @@
         done
 
-        grep -E "^#.*vgchange" /tmp/i-want-my-lvm | sed "s/^#[ ]*//" > /tmp/start-lvm
+        grep -E "^#.*vgchange" $MINDI_CACHE/i-want-my-lvm | sed "s/^#[ ]*//" > /tmp/start-lvm
         chmod +x /tmp/start-lvm
         echo -en "Starting LVM's..."

branches/2.2.10/mondo-doc/mondorescue-howto.sgml

@@ -2517 +2517 @@
 <para>A: Mondo supports LVM v1 and v2. Mondo backs up and restores your
 existing setup but it does not make it easy for you to change your
-LVM configuration, at the moment. You have to edit <filename>/tmp/i-want-my-lvm</filename> at boot-time
+LVM configuration, at the moment. You have to edit <filename>/var/cache/mindi/i-want-my-lvm</filename> at boot-time
 to do that.</para>
 </answer>

branches/2.2.10/mondo/src/common/libmondo-archive.c

@@ -2203 +2203 @@
     }
 
-    mr_asprintf(command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
-            biggielist);
-    paranoid_system(command);
-    mr_free(command);
-
     mr_asprintf(blah, "biggielist = %s", biggielist);
     log_msg(2, blah);

branches/2.2.10/mondo/src/common/libmondo-devices.c

@@ -54 +54 @@
  * @ingroup globalGroup
  */
-bool g_restoring_live_from_cd = FALSE;
-bool g_restoring_live_from_netfs = FALSE;
-
 extern t_bkptype g_backup_media_type;   // set by main()
 
@@ -2561 +2558 @@
     // Tape, CD, NETFS, ...?
     srandom(getpid());
-    bkpinfo->backup_media_type =
-        (g_restoring_live_from_cd) ? cdr :
-        which_backup_media_type(bkpinfo->restore_data);
+    bkpinfo->backup_media_type = which_backup_media_type(bkpinfo->restore_data);
     if (bkpinfo->backup_media_type == none) {
         log_to_screen("User has chosen not to backup the PC");

branches/2.2.10/mondo/src/common/libmondo-filelist.c

@@ -104 +104 @@
     estimate_noof_media_required(noof_sets);    // for cosmetic purposes
 
-    mr_asprintf(tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(tempfile, "%s/biggielist.txt", bkpinfo->scratchdir);
     if (!(fout = fopen(tempfile, "a"))) {
         log_OS_error("Cannot append to biggielist");
@@ -237 +237 @@
     curr_set_size = 0;
     mr_asprintf(outfname, "%s/filelist.%ld", bkpinfo->tmpdir, curr_set_no);
-    mr_asprintf(biggie_fname, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(biggie_fname, "%s/biggielist.txt", bkpinfo->scratchdir);
     log_it("outfname=%s; biggie_fname=%s", outfname, biggie_fname);
     if (!(fbig = fopen(biggie_fname, "w"))) {
@@ -261 +261 @@
             i = 0;
         }
-        /* Now that we dyn. alloc is truncating needed ?
-        if (i > MAX_STR_LEN - 1) {
-            incoming[MAX_STR_LEN - 30] = '\0';
-            log_msg(1, "Warning - truncating file %s's name", incoming);
-            err++;
-        }
-        */
         if (incoming[i] < 32) {
             incoming[i] = '\0';

branches/2.2.10/mondo/src/common/libmondo-files.c

@@ -754 +754 @@
 
     log_it("Calculating size of all biggiefiles (in total)");
-    mr_asprintf(biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(biggielist, "%s/biggielist.txt", bkpinfo->scratchdir);
     log_it("biggielist = %s", biggielist);
     fin = fopen(biggielist, "r");

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);

branches/2.2.10/mondo/src/mondorestore/mondo-restore-EXT.h

@@ -10 +10 @@
 extern char *g_isodir_format;
 
-extern char *g_biggielist_txt;
 extern char *g_filelist_full;
 extern char *g_biggielist_pot;
@@ -18 +17 @@
 extern char *g_biggielist_restthese;
 extern char *g_imagedevs_restthese;
-extern char *g_mondo_cfg_file;
-extern char *g_mountlist_fname;
 extern char *g_mondo_home;
 

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

@@ -18 +18 @@
 /* Reference to global bkpinfo */
 extern struct s_bkpinfo *bkpinfo;
-
-extern char *g_mountlist_fname;
 
 //static char cvsid[] = "$Id$";
@@ -352 +350 @@
     assert(bkpinfo != NULL);
     mvaddstr_and_log_it(g_currentY, 0, "Comparing 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);
     mr_free(tmp);
@@ -523 +521 @@
 
   /**************************************************************************
-   * also deletes tmp/filelist.full & tmp/biggielist.txt _and_ tries to     *
+   * also deletes tmp/filelist.full & biggielist.txt _and_ tries to     *
    * restore them from start of tape, if available                          *
    **************************************************************************/
@@ -530 +528 @@
     assert(raidlist != NULL);
 
-    while (get_cfg_file_from_archive()) {
-        if (!ask_me_yes_or_no
-            ("Failed to find config file/archives. Choose another source?"))
-        {
-            fatal_error("Unable to find config file/archives. Aborting.");
-        }
-        interactively_obtain_media_parameters_from_user(FALSE);
-    }
-
-    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
+    read_cfg_file_into_bkpinfo(MINDI_CACHE"/mondorestore.cfg");
 
     /* edit_mountlist if wanted */
     log_it("About to edit mountlist");
     if (g_text_mode) {
-        save_mountlist_to_disk(mountlist, g_mountlist_fname);
-        mr_asprintf(tmp, "%s %s", find_my_editor(), g_mountlist_fname);
+        save_mountlist_to_disk(mountlist, MINDI_CACHE"/mountlist.txt");
+        mr_asprintf(tmp, "%s %s", find_my_editor(), MINDI_CACHE"/mountlist.txt");
         res = system(tmp);
         mr_free(tmp);
 
-        load_mountlist(mountlist, g_mountlist_fname);
-    } else {
-        res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
+        load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt");
+    } else {
+        res = edit_mountlist(MINDI_CACHE"/mountlist.txt", mountlist, raidlist);
     }
     log_it("Finished editing mountlist");
@@ -557 +546 @@
         paranoid_MR_finish(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);
 

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

@@ -4 +4 @@
 
 extern void free_MR_global_filenames();
-extern void get_cfg_file_from_archive_or_bust();
 extern bool is_file_in_list(char *, char *, char *);    /* needle, haystack, preamble */
 extern int iso_fiddly_bits(bool nuke_me_please);
@@ -28 +27 @@
 extern void termination_in_progress(int);
 extern int unmount_all_devices(struct mountlist_itself *);
-extern int get_cfg_file_from_archive();
 extern void ask_about_these_imagedevs(char *infname, char *outfname);
 

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

@@ -13 +13 @@
 #include "mondo-rstr-tools.h"
 
-/**
- * The biggielist stub (appended to the directory where all.tar.gz was unpacked).
- */
-#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"
-
-/**
- * The mountlist 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 MINDI_CACHE_REL"/mondorestore.cfg"
-/**
- * The i-want-my-lvm stub
- */
-#define IWANTMYLVM_STUB "tmp/i-want-my-lvm"
-
 extern bool g_ISO_restore_mode; /* are we in Iso Mode? */
 extern bool g_I_have_just_nuked;
@@ -44 +20 @@
 extern char *g_isodir_device;
 extern long g_current_progress, g_maximum_progress;
-extern char *g_biggielist_txt;  // where 'biggielist.txt' is stored, on ramdisk / tempdir;
-                  // biggielist.txt is the list of big files stored on the
-                  // backup media set in question
-extern char *g_filelist_full;   // filelist.full.gz is the list of all regular files
-                  // (excluding big files) stored on the backup media set
 extern char *g_biggielist_pot;  // list of big files which _could_ be restored, if the
                   // user chooses them
@@ -56 +27 @@
 extern char *g_imagedevs_restthese; // of the imagedevs listed in FILELIST_IMAGEDEVS,
                       // restore only these
-extern char *g_mondo_cfg_file;  // where m*ndo-restore.cfg (the config file) is stored
-extern char *g_mountlist_fname; // where mountlist.txt (the mountlist file) is stored
 extern char *g_mondo_home;      // homedir of Mondo; usually /usr/local/share/mondo
 
@@ -85 +54 @@
 void free_MR_global_filenames(void)
 {
-paranoid_free(g_biggielist_txt);
-paranoid_free(g_filelist_full);
 paranoid_free(g_filelist_imagedevs);
 paranoid_free(g_imagedevs_restthese);
-paranoid_free(g_mondo_cfg_file);
-paranoid_free(g_mountlist_fname);
 paranoid_free(g_mondo_home);
 /*
@@ -148 +113 @@
 *ASK_ABOUT_THESE_IMAGEDEVS                                               *
 **************************************************************************/
-
-
-
-
-
-
-
-
-/**
-* 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.
-* @param output_cfg_file Where to put the configuration file extracted.
-* @param output_mountlist_file Where to put the mountlist file extracted.
-* @return 0 for success, nonzero for failure.
-* @ingroup restoreUtilityGroup
-*/
-
-/**
-* Keep trying to get mondorestore.cfg from the archive, until the user gives up.
-*/
-void get_cfg_file_from_archive_or_bust()
-{
-while (get_cfg_file_from_archive()) {
-if (!ask_me_yes_or_no
-    ("Failed to find config file/archives. Choose another source?"))
-{
-    fatal_error("Could not find config file/archives. Aborting.");
-}
-interactively_obtain_media_parameters_from_user(FALSE);
-}
-}
-
 
 /**
@@ -252 +184 @@
 g_ISO_restore_mode = TRUE;
 mr_free(g_isodir_device);
-g_isodir_device = read_cfg_var(g_mondo_cfg_file, "iso-dev");
+g_isodir_device = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "iso-dev");
 if (bkpinfo->disaster_recovery) {
     /* Patch Conor Daly 26-june-2004 
@@ -272 +204 @@
     return (1);
 }
-paranoid_system("umount " MNT_CDROM " 2> /dev/null");   /* just in case */
+paranoid_system("umount "MNT_CDROM" 2> /dev/null"); /* just in case */
 
 if (is_this_device_mounted(g_isodir_device)) {
@@ -554 +486 @@
     }
 
-    if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
+    if (!run_program_and_log_output("mount | grep -F "MNT_CDROM, FALSE)) {
         log_msg(2, "mount_media() - media already mounted. Fair enough.");
         return (0);
@@ -579 +511 @@
         mr_free(mount_cmd);
 
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s "MNT_CDROM, mddev);
 #else
         mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
@@ -673 +605 @@
 **************************************************************************/
 
+
+/**
+ * Extract mondorestore.cfg and the mountlist from the tape inserted
+ * to the ./tmp/ directory.
+ * @param dev The tape device to read from.
+ * @return 0 for success, nonzero for failure.
+ */
+int extract_cfg_file_and_mountlist_from_tape_dev(char *dev)
+{
+    char *command = NULL;
+    int res = 0;
+
+    if (bkpinfo->use_obdr) {
+        skip_obdr();
+    } else {
+        // BCO: below 32KB seems to block at least on RHAS 2.1 and MDK 10.0
+        set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
+    }
+
+    mr_asprintf(command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx ."MINDI_CACHE"/biggielist.txt ."MINDI_CACHE"/filelist.full.gz ."MINDI_CACHE"/i-want-my-lvm", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size);
+    log_msg(2, "command = '%s'", command);
+    res = run_program_and_log_output(command, -1);
+    mr_free(command);
+
+    return (res);
+}
+
+
+
+/**
+ * Get the configuration file from the initrd of the backup media
+ * case when calling mondorestore live
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->backup_media_type
+ * - @c bkpinfo->media_device
+ * - @c bkpinfo->tmpdir
+ * @return 0 for success, nonzero for failure.
+ */
+int get_cfg_file_from_initrd()
+{
+   /** malloc *****/
+    char *command = NULL;
+    char *cfg_file = NULL;
+    char *tmp = NULL;
+    char *mountpt = NULL;
+
+    bool try_plan_B;
+
+    assert(bkpinfo != NULL);
+    log_msg(2, "gcffa --- starting");
+    log_to_screen("I'm thinking...");
+    mr_asprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
+    mr_asprintf(command, "mkdir -p %s", mountpt);
+    run_program_and_log_output(command, FALSE);
+    log_msg(2, "mountpt = %s; ", mountpt);
+    mr_free(command);
+
+    chdir(bkpinfo->tmpdir);
+
+    mr_free(mountpt);
+
+    if (!does_file_exist(cfg_file)) {
+        log_msg(2, "gcffa --- we don't have cfg file yet.");
+        if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+            try_plan_B = TRUE;
+        } else {
+            log_msg(2, "gcffa --- calling mount_media now :)");
+            if (!mount_media()) {
+                log_msg(2,
+                        "gcffa --- managed to mount CD; so, no need for Plan B");
+                try_plan_B = FALSE;
+            } else {
+                try_plan_B = TRUE;
+            }
+            if (what_number_cd_is_this() > 1) {
+                insist_on_this_cd_number((g_current_media_number = 1));
+            }
+        }
+        if (try_plan_B) {
+            log_msg(2, "gcffa --- OK, switching to Plan B");
+            chdir(bkpinfo->tmpdir);
+            run_program_and_log_output("mkdir -p tmp", FALSE);
+
+            if (! bkpinfo->media_device) {
+                mr_asprintf(bkpinfo->media_device, "/dev/st0");
+                log_msg(2, "media_device is blank; assuming %s", bkpinfo->media_device);
+            }
+            mr_asprintf(tmp, "%s", bkpinfo->media_device);
+            if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
+                mr_free(bkpinfo->media_device);
+                mr_asprintf(bkpinfo->media_device, "/dev/st0");
+                if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
+                    mr_free(bkpinfo->media_device);
+                    mr_asprintf(bkpinfo->media_device, "/dev/osst0");
+                    if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
+                        mr_free(bkpinfo->media_device);
+                        mr_asprintf(bkpinfo->media_device, "/dev/ht0");
+                        if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
+                            log_msg(3, "I tried lots of devices but none worked.");
+                            mr_free(bkpinfo->media_device);
+                            mr_asprintf(bkpinfo->media_device, "%s", tmp);
+                        }
+                    }
+                }
+            }
+            mr_free(tmp);
+
+            if (!does_file_exist(MINDI_CACHE_REL"/mondorestore.cfg")) {
+                log_to_screen("Cannot find config info on media");
+                return (1);
+            }
+        } else {
+            log_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 ."MINDI_CACHE"/biggielist.txt ."MINDI_CACHE"/filelist.full.gz ."MINDI_CACHE"/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);
+        }
+    }
+    run_program_and_log_output("umount "MNT_CDROM, FALSE);
+    if (!does_file_exist(cfg_file)) {
+        log_it("%s",cfg_file);
+        log_msg(1, "%s not found", cfg_file);
+        log_to_screen("Oh dear. Unable to recover configuration file from boot disk");
+        return (1);
+    }
+
+    log_to_screen("Recovered mondorestore.cfg");
+
+    run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
+    mr_asprintf(command, "cp -f etc/raidtab /etc/");
+    run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
+    g_backup_media_type = bkpinfo->backup_media_type;
+    return (retval);
+}
 
 
@@ -700 +770 @@
 //  assert_string_is_neither_NULL_nor_zerolength(cfg_file);
 assert(bkpinfo != NULL);
-
-if (!cfgf) {
-    cfg_file = g_mondo_cfg_file;
-} else {
-    cfg_file = cfgf;
-}
+assert(cfgf != NULL);
 
 media_specified_by_user = bkpinfo->backup_media_type;   // or 'none', if not specified
@@ -728 +793 @@
             if (!is_this_device_mounted("/dev/cdrom")) {
                 log_msg(2, "NB: CDROM device not mounted, mounting...");
-                run_program_and_log_output("mount /dev/cdrom " MNT_CDROM, 1);
-            }
-            if (does_file_exist(MNT_CDROM "/archives/filelist.0")) {
+                run_program_and_log_output("mount /dev/cdrom "MNT_CDROM, 1);
+            }
+            if (does_file_exist(MNT_CDROM"/archives/filelist.0")) {
                 bkpinfo->backup_media_type = cdr;
-                run_program_and_log_output("umount " MNT_CDROM, 1);
+                run_program_and_log_output("umount "MNT_CDROM, 1);
                 log_it
                     ("Re-jigging configuration AGAIN. CD-R, not ISO.");
@@ -951 +1016 @@
 }
 
-tmp = read_cfg_var(g_mondo_cfg_file, "please-dont-eject");
+tmp = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "please-dont-eject");
 tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE);
 if (tmp || strstr(tmp1, "donteject")) {
@@ -971 +1036 @@
     } else {
         mr_free(bkpinfo->netfs_mount);
-        bkpinfo->netfs_mount = read_cfg_var(g_mondo_cfg_file, "netfs-server-mount");
+        bkpinfo->netfs_mount = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "netfs-server-mount");
 
         mr_free(bkpinfo->netfs_remote_dir);
-        bkpinfo->netfs_remote_dir = read_cfg_var(g_mondo_cfg_file, "netfs-server-path");
+        bkpinfo->netfs_remote_dir = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "netfs-server-path");
 
         if (bkpinfo->netfs_mount != NULL) {
@@ -1014 +1079 @@
     */
     mr_asprintf(old_isodir, "%s", bkpinfo->isodir);
-    iso_mnt = read_cfg_var(g_mondo_cfg_file, "iso-mnt");
-    iso_path = read_cfg_var(g_mondo_cfg_file, "isodir");
+    iso_mnt = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "iso-mnt");
+    iso_path = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "isodir");
     mr_free(bkpinfo->isodir);
     mr_asprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
@@ -1036 +1101 @@
     }
     mr_free(g_isodir_device);
-    g_isodir_device = read_cfg_var(g_mondo_cfg_file, "iso-dev");
+    g_isodir_device = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "iso-dev");
     log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device);
 
@@ -1081 +1146 @@
 
 if (media_specified_by_user != none) {
-    if (g_restoring_live_from_cd) {
+    if (! bkpinfo->disaster_recovery) {
         if (bkpinfo->backup_media_type != media_specified_by_user) {
             log_msg(2,
@@ -1087 +1152 @@
             interactively_obtain_media_parameters_from_user(FALSE);
             media_specified_by_user = bkpinfo->backup_media_type;
-            get_cfg_file_from_archive();
-    /*
-        if (media_specified_by_user != cdr && media_specified_by_user == cdrw)
-            { g_restoring_live_from_cd = FALSE; }
-    */
+            get_cfg_file_from_initrd();
         }
     }
@@ -1124 +1185 @@
 struct s_node *filelist;
 
-/** add mallocs**/
 char *command = NULL;
 char *tmp;
@@ -1130 +1190 @@
 int res = 0;
 pid_t pid;
-bool extract_mountlist_stub = FALSE;
 
 assert(bkpinfo != NULL);
 malloc_string(tmp);
 
-/* If those files already exist, do not overwrite them later on */
-if (does_file_exist("/"MOUNTLIST_FNAME_STUB)) {
-    extract_mountlist_stub = FALSE;
-} else {
-    extract_mountlist_stub = TRUE;
-}
-
-if (does_file_exist(g_filelist_full)
-&& does_file_exist(g_biggielist_txt)) {
-    log_msg(1, "%s exists", g_filelist_full);
-    log_msg(1, "%s exists", g_biggielist_txt);
-    log_msg(2,
-        "Filelist and biggielist already recovered from media. Yay!");
-} else {
     getcwd(tmp, MAX_STR_LEN);
     chdir(bkpinfo->tmpdir);
     log_msg(1, "chdir(%s)", bkpinfo->tmpdir);
     log_to_screen("Extracting filelist and biggielist from media...");
-    unlink("/tmp/filelist.full");
-    unlink(FILELIST_FULL_STUB);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        mr_asprintf(command, "tar -b %ld -zxf %s ./%s ./%s ./%s ./%s ./%s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
+        mr_asprintf(command, "tar -b %ld -zxf %s ."MINDI_CACHE"/biggielist.txt ."MINDI_CACHE"/filelist.full.gz ."MINDI_CACHE"/i-want-my-lvm", bkpinfo->internal_tape_block_size, bkpinfo->media_device);
         log_msg(1, "tarcommand = %s", command);
         run_program_and_log_output(command, 1);
         mr_free(command);
 
-        if (!does_file_exist(FILELIST_FULL_STUB)) {
-            /* Doing that allow us to remain compatible with pre-2.2.5 versions */
-            log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(command, "tar -b %ld -zxf %s %s %s %s %s %s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
-            log_msg(1, "tarcommand = %s", command);
-            run_program_and_log_output(command, 1);
-            mr_free(command);
-        }
     } else {
         log_msg(2, "Calling insist_on_this_cd_number; bkpinfo->isodir=%s", bkpinfo->isodir);
@@ -1174 +1209 @@
         log_msg(2, "Back from iotcn");
         run_program_and_log_output("mount", 1);
-        mr_asprintf(command, "tar -zxf %s/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
+        mr_asprintf(command, "tar -zxf "MNT_CDROM"/images/all.tar.gz ."MINDI_CACHE"/biggielist.txt ."MINDI_CACHE"/filelist.full.gz ."MINDI_CACHE"/i-want-my-lvm");
 
         log_msg(1, "tarcommand = %s", command);
@@ -1180 +1215 @@
         mr_free(command);
 
-        if (!does_file_exist(FILELIST_FULL_STUB)) {
-            /* Doing that allow us to remain compatible with pre-2.2.5 versions */
-            log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(command, "tar -zxf %s/images/all.tar.gz %s %s %s %s %s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
-
-            log_msg(1, "tarcommand = %s", command);
-            run_program_and_log_output(command, 1);
-            mr_free(command);
-        }
-        if (!does_file_exist(BIGGIELIST_TXT_STUB)) {
-            fatal_error
-                ("all.tar.gz did not include " BIGGIELIST_TXT_STUB);
-        }
-        if (!does_file_exist(FILELIST_FULL_STUB)) {
-            fatal_error
-                ("all.tar.gz did not include " FILELIST_FULL_STUB);
-        }
-    }
-    mr_asprintf(command, "cp -f %s %s", MONDO_CFG_FILE_STUB, g_mondo_cfg_file);
-    run_program_and_log_output(command, FALSE);
-    mr_free(command);
-
-    mr_asprintf(command, "cp -f %s/%s %s", bkpinfo->tmpdir, BIGGIELIST_TXT_STUB, g_biggielist_txt);
-    log_msg(1, "command = %s", command);
-    paranoid_system(command);
-    mr_free(command);
-
-    mr_asprintf(command, "ln -sf %s/%s %s", bkpinfo->tmpdir, FILELIST_FULL_STUB, g_filelist_full);
-    log_msg(1, "command = %s", command);
-    paranoid_system(command);
-    mr_free(command);
-}
-
-if (am_I_in_disaster_recovery_mode()
-    &&
-    /* If it was there, do not overwrite it */
-    (extract_mountlist_stub) 
-    &&
-    ask_me_yes_or_no("Do you want to retrieve the mountlist as well?")) {
-        mr_asprintf(command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir);
-        paranoid_system(command);
-        mr_free(command);
-    }
-
+        if (!does_file_exist(MINDI_CACHE"/biggielist.txt")) {
+            fatal_error("all.tar.gz did not include "MINDI_CACHE"/biggielist.txt");
+        }
+        if (!does_file_exist(MINDI_CACHE"/filelist.full.gz")) {
+            fatal_error("all.tar.gz did not include "MINDI_CACHE"/filelist.full.gz");
+        }
+    }
     chdir(tmp);
-
-    if (!does_file_exist(g_biggielist_txt)) {
-        log_msg(1, "Warning - %s not found", g_biggielist_txt);
-    }
-    if (!does_file_exist(g_filelist_full)) {
-        log_msg(1, "Warning - %s does not exist", g_filelist_full);
-    }
-//  popup_and_OK("Wonderful.");
 
     log_msg(2, "Forking");
@@ -1243 +1233 @@
     case 0:
         log_to_screen("Pre-processing filelist");
-        if (!does_file_exist(g_biggielist_txt)) {
-            mr_asprintf(command, "echo -n > %s", g_biggielist_txt);
-            paranoid_system(command);
-            mr_free(command);
-        }
-        mr_asprintf(command, "grep -E '^/dev/.*' %s > %s", g_biggielist_txt, g_filelist_imagedevs);
+        mr_asprintf(command, "grep -E '^/dev/.*' "MINDI_CACHE"/biggielist.txt > %s 2> /dev/null", g_filelist_imagedevs);
         paranoid_system(command);
         mr_free(command);
@@ -1264 +1249 @@
 
     log_msg(3, "loading filelist");
-    filelist = load_filelist(g_filelist_full);
+    filelist = load_filelist(MINDI_CACHE"/filelist.full.gz");
     log_msg(3, "deleting original filelist");
-    unlink(g_filelist_full);
+    unlink(MINDI_CACHE"/filelist.full.gz");
     if (g_text_mode) {
         printf("Restore which directory? --> ");
@@ -1288 +1273 @@
     close_evalcall_form();
 
-    // NB: It's not necessary to add g_biggielist_txt to the filelist.full
+    // NB: It's not necessary to add biggielist.txt to the filelist.full
     // file. The filelist.full file already contains the filename of EVERY
     // file backed up - regular and biggie files.
@@ -1392 +1377 @@
     backup_crucial_file(MNT_RESTORING, "/boot/grub/device.map");
     backup_crucial_file(MNT_RESTORING, "/etc/mtab");
-    device = read_cfg_var(g_mondo_cfg_file, "bootloader.device");
-    name = read_cfg_var(g_mondo_cfg_file, "bootloader.name");
+    device = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "bootloader.device");
+    name = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "bootloader.name");
     log_msg(2, "run_boot_loader: device='%s', name='%s'", device, name);
     sync();
@@ -1908 +1893 @@
     assert(bkpinfo != NULL);
 
-    malloc_string(g_biggielist_txt);
-    malloc_string(g_filelist_full);
     malloc_string(g_filelist_imagedevs);
     malloc_string(g_imagedevs_restthese);
-    malloc_string(g_mondo_cfg_file);
-    malloc_string(g_mountlist_fname);
     malloc_string(g_mondo_home);
 
-    sprintf(g_biggielist_txt, "%s/%s", bkpinfo->tmpdir, BIGGIELIST_TXT_STUB);
-    sprintf(g_filelist_full, "%s/%s", bkpinfo->tmpdir, FILELIST_FULL_STUB);
     sprintf(g_filelist_imagedevs, "%s/tmp/filelist.imagedevs", bkpinfo->tmpdir);
     sprintf(g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these", bkpinfo->tmpdir);
-    if (bkpinfo->disaster_recovery) {
-        sprintf(g_mondo_cfg_file, "/%s", MONDO_CFG_FILE_STUB);
-        sprintf(g_mountlist_fname, "/%s", MOUNTLIST_FNAME_STUB);
-    } else {
-        sprintf(g_mondo_cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
-        sprintf(g_mountlist_fname, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
+    if (! bkpinfo->disaster_recovery) {
+        /* TODO: We need to get mondorestore.cfg and mountlist.txt from initrd.img */
+        get_cfg_file_from_initrd()
     }
 }
@@ -2127 +2103 @@
 
 
-/**
- * Extract mondorestore.cfg and the mountlist from the tape inserted
- * to the ./tmp/ directory.
- * @param dev The tape device to read from.
- * @return 0 for success, nonzero for failure.
- */
-int extract_cfg_file_and_mountlist_from_tape_dev(char *dev)
-{
-    char *command = NULL;
-    int res = 0;
-
-    if (bkpinfo->use_obdr) {
-        skip_obdr();
-    } else {
-        // BCO: below 32KB seems to block at least on RHAS 2.1 and MDK 10.0
-        set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
-    }
-
-    mr_asprintf(command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx ./%s ./%s ./%s ./%s ./%s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
-    log_msg(2, "command = '%s'", command);
-    res = run_program_and_log_output(command, -1);
-    mr_free(command);
-
-    if (res != 0) {
-        if (does_file_exist(MONDO_CFG_FILE_STUB)) {
-            res = 0;
-        } else {
-            /* Doing that allow us to remain compatible with pre-2.2.5 versions */
-            log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
-            log_msg(2, "command = '%s'", command);
-            res = run_program_and_log_output(command, -1);
-            mr_free(command);
-
-            if ((res != 0) && (does_file_exist(MONDO_CFG_FILE_STUB))) {
-                res = 0;
-            }
-        }
-    }
-    return (res);
-}
-
-
-
-/**
- * Get the configuration file from the floppy, tape, or CD.
- * @param bkpinfo The backup information structure. Fields used:
- * - @c bkpinfo->backup_media_type
- * - @c bkpinfo->media_device
- * - @c bkpinfo->tmpdir
- * @return 0 for success, nonzero for failure.
- */
-int get_cfg_file_from_archive()
-{
-    int retval = 0;
-
-   /** malloc *****/
-    char *command = NULL;
-    char *cfg_file = NULL;
-    char *tmp = NULL;
-    char *tmp1 = NULL;
-    char *mountpt = NULL;
-    char *mountlist_file = NULL;
-    bool extract_mountlist_stub = FALSE;
-    bool extract_i_want_my_lvm = FALSE;
-
-    bool try_plan_B;
-
-    assert(bkpinfo != NULL);
-    log_msg(2, "gcffa --- starting");
-    log_to_screen("I'm thinking...");
-    mr_asprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
-    chdir(bkpinfo->tmpdir);
-    mr_asprintf(cfg_file, "%s", MONDO_CFG_FILE_STUB);
-    unlink(cfg_file);           // cfg_file[] is missing the '/' at the start, FYI, by intent
-    mr_free(cfg_file);
-
-    unlink(FILELIST_FULL_STUB);
-    unlink(BIGGIELIST_TXT_STUB);
-    mr_asprintf(command, "mkdir -p %s", mountpt);
-    run_program_and_log_output(command, FALSE);
-    mr_free(command);
-
-    mr_asprintf(cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
-    mr_asprintf(mountlist_file, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
-    log_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
-    mr_free(mountpt);
-
-    if (!does_file_exist(cfg_file)) {
-        log_msg(2, "gcffa --- we don't have cfg file yet.");
-        if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-            try_plan_B = TRUE;
-        } else {
-            log_msg(2, "gcffa --- calling mount_media now :)");
-            if (!mount_media()) {
-                log_msg(2,
-                        "gcffa --- managed to mount CD; so, no need for Plan B");
-                try_plan_B = FALSE;
-            } else {
-                try_plan_B = TRUE;
-            }
-            if (what_number_cd_is_this() > 1) {
-                insist_on_this_cd_number((g_current_media_number = 1));
-            }
-        }
-        if (try_plan_B) {
-            log_msg(2, "gcffa --- OK, switching to Plan B");
-            chdir(bkpinfo->tmpdir);
-            run_program_and_log_output("mkdir -p tmp", FALSE);
-
-            if (! bkpinfo->media_device) {
-                mr_asprintf(bkpinfo->media_device, "/dev/st0");
-                log_msg(2, "media_device is blank; assuming %s", bkpinfo->media_device);
-            }
-            mr_asprintf(tmp, "%s", bkpinfo->media_device);
-            if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
-                mr_free(bkpinfo->media_device);
-                mr_asprintf(bkpinfo->media_device, "/dev/st0");
-                if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
-                    mr_free(bkpinfo->media_device);
-                    mr_asprintf(bkpinfo->media_device, "/dev/osst0");
-                    if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
-                        mr_free(bkpinfo->media_device);
-                        mr_asprintf(bkpinfo->media_device, "/dev/ht0");
-                        if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
-                            log_msg(3, "I tried lots of devices but none worked.");
-                            mr_free(bkpinfo->media_device);
-                            mr_asprintf(bkpinfo->media_device, "%s", tmp);
-                        }
-                    }
-                }
-            }
-            mr_free(tmp);
-
-            if (!does_file_exist(MINDI_CACHE_REL"/mondorestore.cfg")) {
-                log_to_screen("Cannot find config info on media");
-                return (1);
-            }
-        } else {
-                if (does_file_exist("/"MOUNTLIST_FNAME_STUB)) {
-                    extract_mountlist_stub = FALSE;
-                } else {
-                    extract_mountlist_stub = TRUE;
-                }
-                if (does_file_exist("/"IWANTMYLVM_STUB)) {
-                    extract_i_want_my_lvm = FALSE;
-                } else {
-                    extract_i_want_my_lvm = TRUE;
-                }
-
-                log_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, IWANTMYLVM_STUB);    // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
-                run_program_and_log_output(command, TRUE);
-                mr_free(command);
-
-                if (!does_file_exist(MONDO_CFG_FILE_STUB)) {
-                    /* Doing that allow us to remain compatible with pre-2.2.5 versions */
-                    log_msg(2, "pre-2.2.4 compatible mode on");
-                    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, IWANTMYLVM_STUB);  // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
-                    run_program_and_log_output(command, TRUE);
-                    mr_free(command);
-
-                    if (!does_file_exist(MONDO_CFG_FILE_STUB)) {
-                        fatal_error
-                            ("Please reinsert the disk/CD and try again.");
-                    }
-                }
-        }
-    }
-    if (does_file_exist(MONDO_CFG_FILE_STUB)) {
-        log_msg(1, "gcffa --- great! We've got the config file");
-        tmp = call_program_and_get_last_line_of_output("pwd");
-        mr_strcat(tmp, "/%s", MONDO_CFG_FILE_STUB);
-        mr_asprintf(command, "cp -f %s %s", tmp, cfg_file);
-        log_it("%s",command);
-        if (strcmp(tmp, cfg_file) && run_program_and_log_output(command, 1)) {
-            log_msg(1, "... but an error occurred when I tried to move it to %s", cfg_file);
-        } else {
-            log_msg(1, "... and I moved it successfully to %s", cfg_file);
-        }
-        mr_free(command);
-
-        tmp1 = call_program_and_get_last_line_of_output("pwd");
-        mr_asprintf(command, "cp -f %s/%s %s", tmp1, MOUNTLIST_FNAME_STUB, mountlist_file);
-        mr_free(tmp1);
-
-        log_it("%s",command);
-        if (extract_mountlist_stub) {
-            if (strcmp(tmp, cfg_file) && run_program_and_log_output(command, 1)) {
-                log_msg(1, "Failed to get mountlist");
-            } else {
-                log_msg(1, "Got mountlist too");
-
-                mr_free(command);
-                mr_asprintf(command, "cp -f %s %s", mountlist_file, g_mountlist_fname);
-                if (run_program_and_log_output(command, 1)) {
-                    log_msg(1, "Failed to copy mountlist to /tmp");
-                } else {
-                    log_msg(1, "Copied mountlist to /tmp as well OK");
-                    mr_free(command);
-                    mr_asprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
-                    run_program_and_log_output(command, 1);
-                }
-            }
-        }
-        mr_free(tmp);
-        mr_free(command);
-    }
-    run_program_and_log_output("umount " MNT_CDROM, FALSE);
-    if (!does_file_exist(cfg_file)) {
-        log_it("%s",cfg_file);
-        log_msg(1, "%s not found", cfg_file);
-        log_to_screen
-            ("Oh dear. Unable to recover configuration file from boot disk");
-        return (1);
-    }
-
-    log_to_screen("Recovered mondorestore.cfg");
-    if (!does_file_exist(MOUNTLIST_FNAME_STUB)) {
-        log_to_screen("...but not mountlist.txt - a pity, really...");
-    }
-    else {
-            /* Is this code really useful ??? */
-        if (extract_mountlist_stub) {
-            mr_asprintf(command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
-            run_program_and_log_output(command, FALSE);
-            mr_free(command);
-        }
-    }
-
-    mr_asprintf(command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
-    mr_free(cfg_file);
-
-    run_program_and_log_output(command, FALSE);
-    mr_free(command);
-
-    if (extract_mountlist_stub) {
-        mr_asprintf(command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
-        run_program_and_log_output(command, FALSE);
-        mr_free(command);
-    }
-    mr_free(mountlist_file);
-
-    mr_asprintf(command, "cp -f etc/raidtab /etc/");
-    run_program_and_log_output(command, FALSE);
-    mr_free(command);
-
-    if (extract_i_want_my_lvm) {
-        mr_asprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
-        run_program_and_log_output(command, FALSE);
-        mr_free(command);
-    }
-    g_backup_media_type = bkpinfo->backup_media_type;
-    return (retval);
-}
-
 /**************************************************************************
  *END_GET_CFG_FILE_FROM_ARCHIVE                                           *

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

@@ -4 +4 @@
 
 void free_global_filenames();
-void get_cfg_file_from_archive_or_bust();
 bool is_file_in_list(char *, char *, char *);   /* needle, haystack, preamble */
 int iso_fiddly_bits(bool nuke_me_please);
@@ -31 +30 @@
 void termination_in_progress(int);
 int unmount_all_devices(struct mountlist_itself *);
-int get_cfg_file_from_archive();
 void ask_about_these_imagedevs(char *infname, char *outfname);

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);

branches/2.2.10/mondo/src/mondorestore/mr-externs.h

@@ -7 +7 @@
 
 #define SIZE 730000 * 1024      /*  Size for ISO's stops -1 */
-#define BIGGIELIST MNT_CDROM"/archives/biggielist.txt"
 #define ARCHIVES_PATH MNT_CDROM"/archives"
+#define BIGGIELIST ARCHIVES_PATH"/biggielist.txt"
 
 #ifdef __FreeBSD__
@@ -91 +91 @@
                                                                 mountlist_itself
                                                                 *mountlist);
-extern int get_cfg_file_from_archive();
-
-
 
 /**************************************************************************
@@ -106 +103 @@
 extern FILE *g_tape_stream;
 extern bool g_text_mode;
-extern bool g_restoring_live_from_cd;
-extern bool g_restoring_live_from_netfs;
 extern int fput_string_one_char_at_a_time(FILE *, char *);
 extern char *evaluate_mountlist(struct mountlist_itself *mountlist);

branches/2.2.10/mondo/test/test-mountlist.c

@@ -28 +28 @@
 char *g_isodir_device;
 char *g_isodir_format;
-char *g_biggielist_txt;
 char *g_filelist_full;
 char *g_filelist_imagedevs;
 char *g_imagedevs_restthese;
 
-char *g_mondo_cfg_file;
-
-char *g_mountlist_fname;
 char *g_mondo_home;
 
@@ -68 +64 @@
 
 setup_newt_stuff();
-mr_asprintf(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
 log_it("before mountlist");
-load_mountlist(mountlist, g_mountlist_fname);
+load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt");
 log_it("after mountlist");
 resize_mountlist_proportionately_to_suit_new_drives(mountlist);
@@ -76 +71 @@
 load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
 log_it("after load_raidtab_into_raidlist");
-edit_mountlist(g_mountlist_fname, mountlist, raidlist);
+edit_mountlist(MINDI_CACHE"/mountlist.txt", mountlist, raidlist);
 log_it("after edit_mountlist");
 

branches/2.2.10/mondo/test/test-truncname.c

@@ -27 +27 @@
 char *g_isodir_device;
 char *g_isodir_format;
-char *g_biggielist_txt;
 char *g_filelist_full;
 char *g_filelist_imagedevs;
 char *g_imagedevs_restthese;
 
-char *g_mondo_cfg_file;
-
-char *g_mountlist_fname;
 char *g_mondo_home;