Changeset 3879 in MondoRescue for branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Mar 9, 2024, 3:10:04 AM (4 months ago)

Author:

Bruno Cornec

Message:

Fix all remaining compiler errors

File:

• branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (10 diffs)

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

@@ -10 +10 @@
 #include "mr_file.h"
 #include "mr_sys.h"
-#include "../common/mondostructures.h"
-#include "../common/libmondo.h"
-#include "mr-externs.h"
-#include "mondo-rstr-tools.h"
+#include "mondostructures.h"
 #include "libmondo-mountlist-EXT.h"
+#include "libmondo-tools-EXT.h"
+#include "libmondo-filelist-EXT.h"
+#include "libmondo-files-EXT.h"
+#include "libmondo-devices-EXT.h"
+#include "libmondo-string-EXT.h"
+#include "libmondo-raid-EXT.h"
+#include "libmondo-fork-EXT.h"
 #include "newt-specific-EXT.h"
+// no include for now in mondo-rstr-newt.c
+extern int edit_filelist(struct s_node *);
 
 /**
@@ -74 +80 @@
 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
+extern int g_currentY;
+extern bool g_restoring_live_from_cd;
+extern bool g_text_mode;
+extern int g_current_media_number;
 
 extern t_bkptype g_backup_media_type;
@@ -169 +179 @@
 
 
-
+/**
+ * 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 {
+        // TODO: 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;
+            }
+        }
+    }
+    paranoid_free(command);
+    return (res);
+}
+
+
+
+
+
+/**
+ * Get the configuration file from the 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);
+    if (chdir(bkpinfo->tmpdir)) {
+        // FIXME
+    }
+    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(MNT_CDROM)) {
+                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");
+            if (chdir(bkpinfo->tmpdir)) {
+                // FIXME
+            }
+            run_program_and_log_output("mkdir -p tmp", FALSE);
+
+            if (bkpinfo->media_device == NULL) {
+                mr_asprintf(bkpinfo->media_device, "%s", "/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, "%s", "/dev/st0");
+                if (extract_cfg_file_and_mountlist_from_tape_dev(bkpinfo->media_device)) {
+                    mr_free(bkpinfo->media_device);
+                    mr_asprintf(bkpinfo->media_device, "%s", "/dev/osst0");
+                    if (extract_cfg_file_and_mountlist_from_tape_dev(bkpinfo->media_device)) {
+                        mr_free(bkpinfo->media_device);
+                        mr_asprintf(bkpinfo->media_device, "%s", "/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);
+                        }
+                    }
+                }
+            }
+            if (bkpinfo->media_device == NULL) {
+                bkpinfo->media_device = tmp;
+            } else {
+                mr_free(tmp);
+            }
+
+            if (!does_file_exist("tmp/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");
+        tmp1 = call_program_and_get_last_line_of_output("pwd");
+        mr_asprintf(tmp, "%s/%s", tmp1, 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);
+
+        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(command);
+        mr_free(tmp);
+    }
+
+    run_program_and_log_output("umount -d " 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                                           *
+ **************************************************************************/
 
 
@@ -642 +915 @@
 /** add mallocs **/
 char value[MAX_STR_LEN];
+char *tmp = NULL;
 char *tmp1 = NULL;
 char *envtmp1 = NULL;
@@ -683 +957 @@
                 run_program_and_log_output("mount /dev/cdrom "MNT_CDROM, 1);
             }
-            if (does_file_exist(MNT_CDROM"/archives/filelist.0")) {
+            if (does_file_exist(ARCHIVES_PATH "/filelist.0")) {
                 bkpinfo->backup_media_type = cdr;
                 run_program_and_log_output("umount -d "MNT_CDROM, 1);
@@ -1284 +1558 @@
 
 /**
- * Install the user's boot loader in the MBR.
- * Currently LILO, ELILO, GRUB, RAW (dd of MBR), and the FreeBSD bootloader are supported.
- * @param offer_to_hack_scripts If TRUE, then offer to hack the user's fstab for them.
- * @return 0 for success, nonzero for failure.
- */
-int run_boot_loader(bool offer_to_hack_scripts)
-{
-    int res;
-    int retval = 0;
-
-  /** malloc *******/
-    char *device = NULL;
-    char *disk = NULL;
-    char *name = NULL;
-    char *type = NULL;
-    char *cmd = NULL;
-
-    malloc_string(device);
-    malloc_string(name);
-    malloc_string(type);
-
-    /* In order to have a working bootloader, we need to have all devices
-     * ready in the chroot. If they are not there (udev) then copy them from
-     * the current /dev location 
-     */
-    mr_asprintf(cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
-    run_program_and_log_output(cmd, 3);
-    mr_free(cmd);
-
-    backup_crucial_file(MNT_RESTORING, "/etc/fstab");
-    backup_crucial_file(MNT_RESTORING, "/boot/grub/menu.lst");
-    backup_crucial_file(MNT_RESTORING, "/boot/grub/grub.cfg");
-    backup_crucial_file(MNT_RESTORING, "/boot/grub2/grub.cfg");
-    backup_crucial_file(MNT_RESTORING, "/etc/lilo.conf");
-    backup_crucial_file(MNT_RESTORING, "/etc/elilo.conf");
-    backup_crucial_file(MNT_RESTORING, "/boot/grub/device.map");
-    backup_crucial_file(MNT_RESTORING, "/boot/grub2/device.map");
-    backup_crucial_file(MNT_RESTORING, "/etc/mtab");
-    read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
-    read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-    read_cfg_var(g_mondo_cfg_file, "boot-type", type);
-    log_msg(2, "run_boot_loader: device='%s', name='%s', type='%s'", device, name, type);
-    sync();
-
-    offer_to_make_initrd();
-
-    disk = truncate_to_drive_name(device);
-    if (strcmp(type,"BIOS") == 0) {
-        // Force installation of a MBR bootloader brought by mindi on the disk
-        // in case none was available and we then start from a partition
-        log_msg(2, "Reinstalling mbr.bin on %s", disk);
-        mr_system("dd bs=440 count=1 conv=notrunc if=/tmp/mbr.bin of=%s &> /dev/null",disk);
-    } else {
-        // Same for GPT
-        log_msg(2, "Reinstalling gptmbr.bin on %s", disk);
-        mr_system("dd bs=440 count=1 conv=notrunc if=/tmp/gptmbr.bin of=%s &> /dev/null",disk);
-    }
-
-    // Now reinstall bootloader
-    if (!strcmp(name, "LILO")) {
-        res = run_lilo(offer_to_hack_scripts);
-    } else if (!strcmp(name, "ELILO")) {
-        res = run_elilo(offer_to_hack_scripts);
-    } else if (!strcmp(name, "GRUB")) {
-        res = run_grub(offer_to_hack_scripts, device);
-    } else if (!strcmp(name, "RAW")) {
-        res = run_raw_mbr(offer_to_hack_scripts, device);
-    }
-#ifdef __FreeBSD__
-    else if (!strcmp(name, "BOOT0")) {
-        mr_asprintf(tmp, "boot0cfg -B %s", device);
-        res = run_program_and_log_output(tmp, FALSE);
-        paranoid_free(tmp);
-    } else {
-        mr_asprintf(tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
-        if (!system(tmp)) {
-            mr_free(tmp);
-            mr_asprintf(tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
-            res = run_program_and_log_output(tmp, 3);
-        } else {
-            log_msg(1, "I'm not running any boot loader. You have a DD boot drive. It's already loaded up.");
-        }
-        mr_free(tmp);
-    }
-#else
-    else {
-        log_to_screen
-            ("Unable to determine type of boot loader. Defaulting to LILO.");
-        res = run_lilo(offer_to_hack_scripts);
-    }
-#endif
-    retval += res;
-    if (res) {
-        log_to_screen("Your boot loader returned an error");
-    } else {
-        log_to_screen("Your boot loader ran OK");
-    }
-    paranoid_free(device);
-    paranoid_free(name);
-    return (retval);
-}
-
-/**************************************************************************
- *END_ RUN_BOOT_LOADER                                                    *
- **************************************************************************/
-
-
-
-/**
  * Attempt to find the user's editor.
  * @return The editor found ("vi" if none could be found).
@@ -1417 +1582 @@
     return (output);
 }
+
+
+
+
+/**
+ * Install LILO on the user's boot drive (determined by /etc/lilo.conf).
+ * @param offer_to_run_stablilo If TRUE, then offer to hack the user's fstab for them.
+ * @return 0 for success, nonzero for failure.
+ */
+int run_lilo(bool offer_to_run_stablilo)
+{
+  /** malloc **/
+    char *command = NULL;
+    char *tmp = NULL;
+    char *editor = NULL;
+
+    int res;
+    int done;
+    bool run_lilo_M = FALSE;
+
+    if (!run_program_and_log_output
+        ("grep \"boot.*=.*/dev/md\" " MNT_RESTORING "/etc/lilo.conf", 1)) {
+        run_lilo_M = TRUE;
+    }
+
+    if (offer_to_run_stablilo
+        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
+
+        /* interactive mode */
+    {
+        mvaddstr_and_log_it(g_currentY,
+                            0,
+                            "Modifying fstab and lilo.conf, and running LILO...                             ");
+        mr_asprintf(command, "mr-stablilo-me");
+        res = run_program_and_log_output(command, 3);
+        mr_free(command);
+
+        if (res) {
+            popup_and_OK
+                ("You will now edit fstab and lilo.conf, to make sure they match your new mountlist.");
+            for (done = FALSE; !done;) {
+                editor = find_my_editor();
+                if (editor == NULL) {
+                    popup_and_OK("No editor found. You won't be able to edit conf files");
+                } else {
+                    if (!g_text_mode) {
+                        newtSuspend();
+                    }
+                    mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                    paranoid_system(tmp);
+                    mr_free(tmp);
+    
+                    mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
+                    paranoid_system(tmp);
+                    mr_free(tmp);
+                    mr_free(editor);
+    
+                    if (!g_text_mode) {
+                        newtResume();
+                    }
+//              newtCls();
+                    if (ask_me_yes_or_no("Edit them again?")) {
+                        continue;
+                    }
+                }
+                mr_free(editor);
+
+                res = run_program_and_log_output("chroot " MNT_RESTORING " lilo -L", 3);
+                if (res) {
+                    res = run_program_and_log_output("chroot " MNT_RESTORING " lilo", 3);
+                }
+                if (res) {
+                    done = ask_me_yes_or_no("LILO failed. Re-edit system files?");
+                } else {
+                    done = TRUE;
+                }
+            }
+        } else {
+            log_to_screen("lilo.conf and fstab were modified OK");
+        }
+    } else
+        /* nuke mode */
+    {
+        mvaddstr_and_log_it(g_currentY,
+                            0,
+                            "Running LILO...                                                 ");
+        res =
+            run_program_and_log_output("chroot " MNT_RESTORING " lilo -L",
+                                       3);
+        if (res) {
+            res =
+                run_program_and_log_output("chroot " MNT_RESTORING " lilo",
+                                           3);
+        }
+        if (res) {
+            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+            log_to_screen
+                ("Failed to re-jig fstab and/or lilo. Edit/run manually, please.");
+        } else {
+            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        }
+    }
+    if (run_lilo_M) {
+        run_program_and_log_output("chroot " MNT_RESTORING
+                                   " lilo -M /dev/hda", 3);
+        run_program_and_log_output("chroot " MNT_RESTORING
+                                   " lilo -M /dev/sda", 3);
+    }
+    return (res);
+}
+
+/**************************************************************************
+ *END_RUN_LILO                                                            *
+ **************************************************************************/
+
+
+/**
+ * Install a raw MBR onto @p bd.
+ * @param offer_to_hack_scripts If TRUE, then offer to hack the user's fstab for them.
+ * @param bd The device to copy the stored MBR to.
+ * @return 0 for success, nonzero for failure.
+ */
+int run_raw_mbr(bool offer_to_hack_scripts, char *bd)
+{
+  /** malloc **/
+    char *command = NULL;
+    char *boot_device = NULL;
+    char *tmp = NULL;
+    char *editor;
+    int res;
+    int done;
+
+    malloc_string(boot_device);
+    assert_string_is_neither_NULL_nor_zerolength(bd);
+
+    strcpy(boot_device, bd);
+
+    if (offer_to_hack_scripts
+        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?")) {
+        /* interactive mode */
+        mvaddstr_and_log_it(g_currentY, 0, "Modifying fstab and restoring MBR...                           ");
+        for (done = FALSE; !done;) {
+            popup_and_OK("You will now edit fstab");
+            editor = find_my_editor();
+            if (editor == NULL) {
+                popup_and_OK("No editor found. You won't be able to edit conf files");
+            } else {
+                if (!g_text_mode) {
+                    newtSuspend();
+                }
+                mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+
+                paranoid_system(tmp);
+                mr_free(tmp);
+                if (!g_text_mode) {
+                    newtResume();
+                }
+            }
+            mr_free(editor);
+
+            popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device, MAX_STR_LEN / 4);
+            mr_asprintf(command, "mr-stabraw-me %s", boot_device);
+            res = run_program_and_log_output(command, 3);
+            mr_free(command);
+
+            if (res) {
+                done = ask_me_yes_or_no("Modifications failed. Re-try?");
+            } else {
+                done = TRUE;
+            }
+        }
+    } else {
+        /* nuke mode */
+        mr_asprintf(command, "mr-raw %s /"MOUNTLIST_FNAME_STUB, boot_device);
+        log_msg(2, "run_raw_mbr() --- command='%s'", command);
+
+        mvaddstr_and_log_it(g_currentY, 0, "Restoring MBR...                                               ");
+        res = run_program_and_log_output(command, 3);
+        mr_free(command);
+    }
+    if (res) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        log_to_screen("MBR+fstab processed w/error(s). See %s for more info.", MONDO_LOGFILE);
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(boot_device);
+    return (res);
+}
+
+/**************************************************************************
+ *END_RUN_RAW_MBR                                                         *
+ **************************************************************************/
 
 
@@ -1465 +1823 @@
                     popup_and_OK("The mountlist was changed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
                 }
-                editor = find_my_editor());
+                editor = find_my_editor();
                 if (editor == NULL) {
                     popup_and_OK("No editor found. You won't be able to edit conf files");
@@ -1644 +2002 @@
 
 
-/**
- * Install LILO on the user's boot drive (determined by /etc/lilo.conf).
- * @param offer_to_run_stablilo If TRUE, then offer to hack the user's fstab for them.
+
+/**
+ * Install the user's boot loader in the MBR.
+ * Currently LILO, ELILO, GRUB, RAW (dd of MBR), and the FreeBSD bootloader are supported.
+ * @param offer_to_hack_scripts If TRUE, then offer to hack the user's fstab for them.
  * @return 0 for success, nonzero for failure.
  */
-int run_lilo(bool offer_to_run_stablilo)
+int run_boot_loader(bool offer_to_hack_scripts)
 {
-  /** malloc **/
-    char *command = NULL;
-    char *tmp = NULL;
-    char *editor = NULL;
-
     int res;
-    int done;
-    bool run_lilo_M = FALSE;
-
-    if (!run_program_and_log_output
-        ("grep \"boot.*=.*/dev/md\" " MNT_RESTORING "/etc/lilo.conf", 1)) {
-        run_lilo_M = TRUE;
-    }
-
-    if (offer_to_run_stablilo
-        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
-
-        /* interactive mode */
-    {
-        mvaddstr_and_log_it(g_currentY,
-                            0,
-                            "Modifying fstab and lilo.conf, and running LILO...                             ");
-        mr_asprintf(command, "mr-stablilo-me");
-        res = run_program_and_log_output(command, 3);
-        mr_free(command);
-
-        if (res) {
-            popup_and_OK
-                ("You will now edit fstab and lilo.conf, to make sure they match your new mountlist.");
-            for (done = FALSE; !done;) {
-                editor = find_my_editor();
-                if (editor == NULL) {
-                    popup_and_OK("No editor found. You won't be able to edit conf files");
-                } else {
-                    if (!g_text_mode) {
-                        newtSuspend();
-                    }
-                    mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
-                    paranoid_system(tmp);
-                    mr_free(tmp);
-    
-                    mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
-                    paranoid_system(tmp);
-                    mr_free(tmp);
-                    mr_free(editor);
-    
-                    if (!g_text_mode) {
-                        newtResume();
-                    }
-//              newtCls();
-                    if (ask_me_yes_or_no("Edit them again?")) {
-                        continue;
-                    }
-                }
-                mr_free(editor);
-
-                res = run_program_and_log_output("chroot " MNT_RESTORING " lilo -L", 3);
-                if (res) {
-                    res = run_program_and_log_output("chroot " MNT_RESTORING " lilo", 3);
-                }
-                if (res) {
-                    done = ask_me_yes_or_no("LILO failed. Re-edit system files?");
-                } else {
-                    done = TRUE;
-                }
-            }
+    int retval = 0;
+
+  /** malloc *******/
+    char *device = NULL;
+    char *disk = NULL;
+    char *name = NULL;
+    char *type = NULL;
+    char *cmd = NULL;
+
+    malloc_string(device);
+    malloc_string(name);
+    malloc_string(type);
+
+    /* In order to have a working bootloader, we need to have all devices
+     * ready in the chroot. If they are not there (udev) then copy them from
+     * the current /dev location 
+     */
+    mr_asprintf(cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
+    run_program_and_log_output(cmd, 3);
+    mr_free(cmd);
+
+    backup_crucial_file(MNT_RESTORING, "/etc/fstab");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub/menu.lst");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub/grub.cfg");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub2/grub.cfg");
+    backup_crucial_file(MNT_RESTORING, "/etc/lilo.conf");
+    backup_crucial_file(MNT_RESTORING, "/etc/elilo.conf");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub/device.map");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub2/device.map");
+    backup_crucial_file(MNT_RESTORING, "/etc/mtab");
+    read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
+    read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
+    read_cfg_var(g_mondo_cfg_file, "boot-type", type);
+    log_msg(2, "run_boot_loader: device='%s', name='%s', type='%s'", device, name, type);
+    sync();
+
+    offer_to_make_initrd();
+
+    disk = truncate_to_drive_name(device);
+    if (strcmp(type,"BIOS") == 0) {
+        // Force installation of a MBR bootloader brought by mindi on the disk
+        // in case none was available and we then start from a partition
+        log_msg(2, "Reinstalling mbr.bin on %s", disk);
+        mr_system("dd bs=440 count=1 conv=notrunc if=/tmp/mbr.bin of=%s &> /dev/null",disk);
+    } else {
+        // Same for GPT
+        log_msg(2, "Reinstalling gptmbr.bin on %s", disk);
+        mr_system("dd bs=440 count=1 conv=notrunc if=/tmp/gptmbr.bin of=%s &> /dev/null",disk);
+    }
+
+    // Now reinstall bootloader
+    if (!strcmp(name, "LILO")) {
+        res = run_lilo(offer_to_hack_scripts);
+    } else if (!strcmp(name, "ELILO")) {
+        res = run_elilo(offer_to_hack_scripts);
+    } else if (!strcmp(name, "GRUB")) {
+        res = run_grub(offer_to_hack_scripts, device);
+    } else if (!strcmp(name, "RAW")) {
+        res = run_raw_mbr(offer_to_hack_scripts, device);
+    }
+#ifdef __FreeBSD__
+    else if (!strcmp(name, "BOOT0")) {
+        mr_asprintf(tmp, "boot0cfg -B %s", device);
+        res = run_program_and_log_output(tmp, FALSE);
+        paranoid_free(tmp);
+    } else {
+        mr_asprintf(tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
+        if (!system(tmp)) {
+            mr_free(tmp);
+            mr_asprintf(tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
+            res = run_program_and_log_output(tmp, 3);
         } else {
-            log_to_screen("lilo.conf and fstab were modified OK");
-        }
-    } else
-        /* nuke mode */
-    {
-        mvaddstr_and_log_it(g_currentY,
-                            0,
-                            "Running LILO...                                                 ");
-        res =
-            run_program_and_log_output("chroot " MNT_RESTORING " lilo -L",
-                                       3);
-        if (res) {
-            res =
-                run_program_and_log_output("chroot " MNT_RESTORING " lilo",
-                                           3);
-        }
-        if (res) {
-            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-            log_to_screen
-                ("Failed to re-jig fstab and/or lilo. Edit/run manually, please.");
-        } else {
-            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-        }
-    }
-    if (run_lilo_M) {
-        run_program_and_log_output("chroot " MNT_RESTORING
-                                   " lilo -M /dev/hda", 3);
-        run_program_and_log_output("chroot " MNT_RESTORING
-                                   " lilo -M /dev/sda", 3);
-    }
-    return (res);
+            log_msg(1, "I'm not running any boot loader. You have a DD boot drive. It's already loaded up.");
+        }
+        mr_free(tmp);
+    }
+#else
+    else {
+        log_to_screen
+            ("Unable to determine type of boot loader. Defaulting to LILO.");
+        res = run_lilo(offer_to_hack_scripts);
+    }
+#endif
+    retval += res;
+    if (res) {
+        log_to_screen("Your boot loader returned an error");
+    } else {
+        log_to_screen("Your boot loader ran OK");
+    }
+    paranoid_free(device);
+    paranoid_free(name);
+    return (retval);
 }
 
 /**************************************************************************
- *END_RUN_LILO                                                            *
- **************************************************************************/
-
-
-/**
- * Install a raw MBR onto @p bd.
- * @param offer_to_hack_scripts If TRUE, then offer to hack the user's fstab for them.
- * @param bd The device to copy the stored MBR to.
- * @return 0 for success, nonzero for failure.
- */
-int run_raw_mbr(bool offer_to_hack_scripts, char *bd)
-{
-  /** malloc **/
-    char *command = NULL;
-    char *boot_device = NULL;
-    char *tmp = NULL;
-    char *editor;
-    int res;
-    int done;
-
-    malloc_string(boot_device);
-    assert_string_is_neither_NULL_nor_zerolength(bd);
-
-    strcpy(boot_device, bd);
-
-    if (offer_to_hack_scripts
-        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?")) {
-        /* interactive mode */
-        mvaddstr_and_log_it(g_currentY, 0, "Modifying fstab and restoring MBR...                           ");
-        for (done = FALSE; !done;) {
-            popup_and_OK("You will now edit fstab");
-            editor = find_my_editor());
-            if (editor == NULL) {
-                popup_and_OK("No editor found. You won't be able to edit conf files");
-            } else {
-                if (!g_text_mode) {
-                    newtSuspend();
-                }
-                mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
-
-                paranoid_system(tmp);
-                mr_free(tmp);
-                if (!g_text_mode) {
-                    newtResume();
-                }
-            }
-            mr_free(editor);
-
-            popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device, MAX_STR_LEN / 4);
-            mr_asprintf(command, "mr-stabraw-me %s", boot_device);
-            res = run_program_and_log_output(command, 3);
-            mr_free(command);
-
-            if (res) {
-                done = ask_me_yes_or_no("Modifications failed. Re-try?");
-            } else {
-                done = TRUE;
-            }
-        }
-    } else {
-        /* nuke mode */
-        mr_asprintf(command, "mr-raw %s /"MOUNTLIST_FNAME_STUB, boot_device);
-        log_msg(2, "run_raw_mbr() --- command='%s'", command);
-
-        mvaddstr_and_log_it(g_currentY, 0, "Restoring MBR...                                               ");
-        res = run_program_and_log_output(command, 3);
-        mr_free(command);
-    }
-    if (res) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-        log_to_screen("MBR+fstab processed w/error(s). See %s for more info.", MONDO_LOGFILE);
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    paranoid_free(boot_device);
-    return (res);
-}
-
-/**************************************************************************
- *END_RUN_RAW_MBR                                                         *
+ *END_ RUN_BOOT_LOADER                                                    *
  **************************************************************************/
 
@@ -2068 +2344 @@
  *END_UNMOUNT_ALL_DEVICES                                                 *
  **************************************************************************/
-
-/**
- * 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 {
-        // TODO: 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;
-            }
-        }
-    }
-    paranoid_free(command);
-    return (res);
-}
-
-
-/**
- * Get the configuration file from the 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);
-    if (chdir(bkpinfo->tmpdir)) {
-        // FIXME
-    }
-    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(MNT_CDROM)) {
-                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");
-            if (chdir(bkpinfo->tmpdir)) {
-                // FIXME
-            }
-            run_program_and_log_output("mkdir -p tmp", FALSE);
-
-            if (bkpinfo->media_device == NULL) {
-                mr_asprintf(bkpinfo->media_device, "%s", "/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, "%s", "/dev/st0");
-                if (extract_cfg_file_and_mountlist_from_tape_dev(bkpinfo->media_device)) {
-                    mr_free(bkpinfo->media_device);
-                    mr_asprintf(bkpinfo->media_device, "%s", "/dev/osst0");
-                    if (extract_cfg_file_and_mountlist_from_tape_dev(bkpinfo->media_device)) {
-                        mr_free(bkpinfo->media_device);
-                        mr_asprintf(bkpinfo->media_device, "%s", "/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);
-                        }
-                    }
-                }
-            }
-            if (bkpinfo->media_device == NULL) {
-                bkpinfo->media_device = tmp;
-            } else {
-                mr_free(tmp);
-            }
-
-            if (!does_file_exist("tmp/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");
-        tmp1 = call_program_and_get_last_line_of_output("pwd");
-        mr_asprintf(tmp, "%s/%s", tmp1, 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);
-
-        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(command);
-        mr_free(tmp);
-    }
-
-    run_program_and_log_output("umount -d " 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                                           *
- **************************************************************************/
-
 /* @} - end restoreUtilityGroup */