Changeset 3297 in MondoRescue

Timestamp:

Jun 7, 2014, 10:39:10 AM (11 years ago)

Author:

Bruno Cornec

Message:

• stabgrub-me now supports also grub2
• Fix an error using mountlist.txt under /var/cache/mindi instead of /tmp - for now - with grub-MR

Location:

branches/3.2/mondo/src

Files:

• mondorestore/mondo-rstr-tools.c (modified) (5 diffs)
• restore-scripts/mondo/stabgrub-me (modified) (1 diff)

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

@@ -1384 +1384 @@
     strcpy(boot_device, bd);
 
-    if (offer_to_run_stabgrub
-        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?")) {
+    if (offer_to_run_stabgrub && 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, mtab, device.map and menu.lst/grub.cfg, and running GRUB...                             ");
+        mvaddstr_and_log_it(g_currentY, 0, "Modifying fstab, mtab, device.map and menu.lst/grub.cfg, and running GRUB...");
         /*  Did we changed the mountlist ? If yes, then force editing conf files */
         if ((fin = fopen(MONDO_MNTLISTCHG, "r")) != NULL) {
@@ -1395 +1392 @@
         }
         for (done = FALSE; !done;) {
-            popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device, MAX_STR_LEN / 4);
+            popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/sda", boot_device, MAX_STR_LEN / 4);
             /*  Only try to adapt grub here first if the mountlist wasn't changed before */
             if (! mntlistchg) {
@@ -1465 +1462 @@
         if (!run_program_and_log_output("which grub-MR", FALSE)) {
             log_msg(1, "Yay! grub-MR found...");
-            mr_asprintf(command, "grub-MR %s "MINDI_CACHE"/mountlist.txt", boot_device);
+            mr_asprintf(command, "grub-MR %s /"MOUNTLIST_FNAME_STUB, boot_device);
             log_msg(1, "command = %s", command);
         } else {
+            // Or grub2-install
             mr_asprintf(command, "chroot " MNT_RESTORING " grub-install %s", boot_device);
             log_msg(1, "WARNING - grub-MR not found; using grub-install");
@@ -1749 +1747 @@
     } else {
         /* nuke mode */
-        mr_asprintf(command, "raw-MR %s "MINDI_CACHE"/mountlist.txt", boot_device);
+        mr_asprintf(command, "raw-MR %s /"MOUNTLIST_FNAME_STUB, boot_device);
         log_msg(2, "run_raw_mbr() --- command='%s'", command);
 
@@ -1809 +1807 @@
     } else {
         sprintf(g_mondo_cfg_file, "%s/%s", temppath, MONDO_CFG_FILE_STUB);
-        sprintf(g_mountlist_fname, "%s/%s", temppath,
-                MOUNTLIST_FNAME_STUB);
+        sprintf(g_mountlist_fname, "%s/%s", temppath, MOUNTLIST_FNAME_STUB);
     }
 }

branches/3.2/mondo/src/restore-scripts/mondo/stabgrub-me

@@ -184 +184 @@
     grub_res=$?
     if [ "$grub_res" -ne "0" ] ; then
-        LogIt "grub-install failed. Running grub-MR..."
+        LogIt "grub-MR failed. Running grub-install..."
         chroot /mnt/RESTORING grub-install '(hd0)' >> $LOGFILE 2>> $LOGFILE
         grub_res=$?
+    else
+        LogIt "grub-MR ran ok." 2
     fi
     if [ "$grub_res" -ne "0" ] ; then
-    LogIt "GRUB failed." 3
+        LogIt "grub failed. Running grub2-install..." 3
+        chroot /mnt/RESTORING grub2-install /dev/sda >> $LOGFILE 2>> $LOGFILE
+        grub_res=$?
     else
         LogIt "GRUB ran ok." 2
     fi
+    if [ "$grub_res" -ne "0" ] ; then
+        LogIt "grub2 failed..." 3
+    else
+        LogIt "GRUB2 ran ok." 2
+    fi
 fi