Changeset 1845 in MondoRescue for branches

Timestamp:

Dec 18, 2007, 1:05:57 AM (16 years ago)

Author:

Bruno Cornec

Message:

Attempt to fix #224

File:

• branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

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

@@ -1473 +1473 @@
     char *tmp;
     char *name;
+    char *cmd = NULL;
 
     malloc_string(device);
     malloc_string(tmp);
     malloc_string(name);
+
+    /* 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 
+     */
+    asprintf(&cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
+    run_program_and_log_output(cmd, 3);
+
     backup_crucial_file(MNT_RESTORING, "/etc/fstab");
     backup_crucial_file(MNT_RESTORING, "/etc/grub.conf");
     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, "/etc/mtab");
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
@@ -1491 +1502 @@
         res = run_elilo(offer_to_hack_scripts);
     } else if (!strcmp(name, "GRUB")) {
-//      if ( does_file_exist(DO_MBR_PLEASE) || (offer_to_hack_scripts && ask_me_yes_or_no("Because of bugs in GRUB, you're much better off running mondorestore --mbr after this program terminates. Are you sure you want to install GRUB right now?")))
-//        {
         res = run_grub(offer_to_hack_scripts, device);
-//    unlink(DO_MBR_PLEASE);
-//  }
-//      else
-//        {
-//    log_msg(1, "Not running run_grub(). Was a bad idea anyway.");
-//    res = 1;
-//  }
     } else if (!strcmp(name, "RAW")) {
         res = run_raw_mbr(offer_to_hack_scripts, device);
@@ -1733 +1735 @@
                     newtSuspend();
                 }
-                sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                sprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
                 paranoid_system(tmp);
-                sprintf(tmp, "%s " MNT_RESTORING "/etc/elilo.conf",
-                        editor);
+                sprintf(tmp, "chroot %s %s /etc/elilo.conf", MNT_RESTORING, editor);
                 paranoid_system(tmp);
                 if (!g_text_mode) {