Changeset 3378 in MondoRescue

Timestamp:

May 6, 2015, 2:10:24 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Deal with grub used with UEFI

Location:

branches/3.2

Files:

• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (2 diffs)
• mondo/src/restore-scripts/mondo/grub-MR (modified) (1 diff)
• mondo/src/restore-scripts/mondo/stabgrub-me (modified) (1 diff)

branches/3.2/mindi/mindi

@@ -3045 +3045 @@
     cat /etc/lilo.conf >> $LOGFILE
 fi
+if [ -d /boot/efi ]; then
+    gcf=`find /boot/efi -name grub.conf`
+    LogFile "-------------"
+    LogFile "INFO: $gcf content"
+    LogFile "-------------"
+    cat $gcf >> $LOGFILE
+    LogFile "-------------"
+fi
+
 LogFile "Full fdisk info"
 LogFile "---------------"

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

@@ -668 +668 @@
         }
         if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg")) && (!does_file_exist("/boot/grub2/grub.cfg"))) {
-            mr_free(bootldr_str);
-            fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
+            /* if UEFI then search under /boot/efi */
+            mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("find /boot/efi -name grub.conf");
+            if (strstr(tmp, "grub.conf") == NULL) {
+                mr_free(bootldr_str);
+                fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
+            }
         }
         mr_asprintf(bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version 2> /dev/null"));

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

@@ -7 +7 @@
  * Functions to handle interactions with backup devices.
  */
+
+#include <sys/types.h>
+#include <dirent.h>
 
 #include "my-stuff.h"
@@ -2116 +2119 @@
 #endif
     /* Try to detect whether we are in fact in UEFI mode */
-    fd = opendir("/sys/firmware/efi", "r");
+    fd = opendir("/sys/firmware/efi");
     if (fd != NULL) {
         ret = UEFI;

branches/3.2/mondo/src/restore-scripts/mondo/grub-MR

@@ -206 +206 @@
 elif [ -f "/mnt/RESTORING/boot/grub2/grub.cfg" ]; then
     grep -vE '^#' /boot/grub2/grub.cfg > /mnt/RESTORING/tmp/grub.conf
+elif [ -d "/mnt/RESTORING/boot/efi" ]; then
+    grep -vE '^#' `find /boot/efi -name grub.conf` > /mnt/RESTORING/tmp/grub.conf
 else
     echo "Unable to find Grub conf file" | tee -a $LOGFILE

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

@@ -79 +79 @@
         return 0
     fi
+    if [ -d "/sys/firmware/efi" ]; then
+        old_grubconf=`find /mnt/RESTORING/boot/efi -name grub.conf`
+    fi
     LogIt "GRUB not found." 2
     return 1