Changeset 3375 in MondoRescue

Timestamp:

Apr 27, 2015, 4:25:30 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Create a new mr_boot_type function and boot_type mondo struct entry to manage BIOS/EFI/UEFI types

Location:

branches/3.2/mondo/src/common

Files:

• libmondo-devices.c (modified) (2 diffs)
• libmondo-tools.c (modified) (1 diff)
• mondostructures.h (modified) (2 diffs)

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

@@ -2104 +2104 @@
 
 
+/**
+ * Return the type of boot of the system (UEFI, EFI or BIOS)
+ */
+t_boot mr_boot_type() {
+
+    t_boot ret = BIOS;
+    FILE *fd = NULL;
+
+#ifdef __IA64__
+    ret = EFI;
+#endif
+    /* Try to detect whether we are in fact in UEFI mode */
+    /* TODO: find the right trigger */
+    fd = fopen("/sys/module/efi", "r");
+    if (fd != NULL) {
+        ret = UEFI;
+    }
+    return(ret);
+}
 
 
@@ -2642 +2661 @@
         }
         bkpinfo->boot_loader = i;
+        bkpinfo->boot_type = mr_boot_type();
+        /* TODO: Chcek consisytency of boot type and boot loader */
 
         if (bkpinfo->include_paths) {

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

@@ -830 +830 @@
     bkpinfo->use_obdr = FALSE;
     bkpinfo->restore_mode = interactive;
+    bkpinfo->boot_type = BIOS;
 }
 

branches/3.2/mondo/src/common/mondostructures.h

@@ -181 +181 @@
     udev                        ///< Back up to another unsupported device; just send a stream of bytes.
 } t_bkptype;
+
+/**
+ * A type of boot
+ */
+typedef enum { 
+    BIOS,                       /// System uses Legacy Boot mode (aka BIOS)
+    EFI,                        /// System uses EFI Boot mode
+    UEFI,                       /// System uses UEFI Boot mode
+} t_boot;
 
 /**
@@ -639 +648 @@
    */
     t_restore_mode restore_mode;
+
+  /**
+   * The type of boot of our ssytem
+   */
+    t_boot boot_type;
+
 };