Changeset 2451 in MondoRescue for branches/2.2.10/mondo/src/mondorestore

Timestamp:

Oct 6, 2009, 1:34:09 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix a mr_asprintf usage without & causing a seg fault.
• Adds support for grub2 conf file grub.cfg in addition to menu.lst
• Fix for #288: only take the first result in SizeOfPartition in case of multiple mounts
• Improve USB log in case of error by adding the conf file

(Backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (4 diffs)

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

@@ -1387 +1387 @@
     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, "/etc/lilo.conf");
     backup_crucial_file(MNT_RESTORING, "/etc/elilo.conf");
@@ -1512 +1513 @@
         mvaddstr_and_log_it(g_currentY,
                             0,
-                            "Modifying fstab, mtab, device.map and menu.lst, and running GRUB...                             ");
+                            "Modifying fstab, mtab, device.map and menu.lst/grub.cfg, and running GRUB...                             ");
         for (done = FALSE; !done;) {
             p = popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device);
@@ -1538 +1539 @@
                 done = TRUE;
             }
-            popup_and_OK("You will now edit fstab, mtab, device.map and menu.lst");
+            popup_and_OK("You will now edit fstab, mtab, device.map and menu.lst/grub.cfg");
             if (!g_text_mode) {
                 newtSuspend();
@@ -1552 +1553 @@
             mr_free(tmp);
 
-            mr_asprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+            if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+            } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+            }
             paranoid_system(tmp);
             mr_free(tmp);