Improvements to install.sh; check for valid loader for MOK and memory

[refind] / refind / global.h

diff --git a/refind/global.h b/refind/global.h
index f8575530f075ac62cf1ebf4a80cc0edd252373da..ea1f71f194e48a252da35fe389f5bdc483ccaccb 100644 (file)
--- a/refind/global.h
+++ b/refind/global.h
@@ -74,7 +74,8 @@
 #define TAG_FIRMWARE         (14)
 #define TAG_MEMTEST          (15)
 #define TAG_GDISK            (16)
-#define NUM_TOOLS            (17)
+#define TAG_NETBOOT          (17)
+#define NUM_TOOLS            (18)
 
 #define NUM_SCAN_OPTIONS 10
 
@@ -146,9 +147,10 @@
 // Directories to search for memtest86....
 #define MEMTEST_LOCATIONS       L"EFI\\tools,EFI\\tools\\memtest86,EFI\\tools\\memtest,EFI\\memtest86,EFI\\memtest"
 // Files that may be Windows recovery files
-#define WINDOWS_RECOVERY_FILES  L"EFI\\Microsoft\\Boot\\LrsBootmgr.efi"
+#define WINDOWS_RECOVERY_FILES  L"EFI\\Microsoft\\Boot\\LrsBootmgr.efi,Recovery:\\EFI\\BOOT\\bootx64.efi,Recovery:\\EFI\\BOOT\\bootia32.efi"
 
-#define NULL_GUID_VALUE { 00000000, 0000, 0000, {0000, 0000, 0000, 0000} };
+#define NULL_GUID_VALUE { 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
+#define REFIND_GUID_VALUE { 0x36D08FA7, 0xCF0B, 0x42F5, {0x8F, 0x14, 0x68, 0xDF, 0x73, 0xED, 0x37, 0x40} };
 
 //
 // global definitions
@@ -236,9 +238,7 @@ typedef struct {
 typedef struct {
    REFIT_MENU_ENTRY  me;
    REFIT_VOLUME      *Volume;
-//#ifndef __MAKEWITH_GNUEFI
    BDS_COMMON_OPTION *BdsOption;
-//#endif
    CHAR16            *LoadOptions;
    BOOLEAN           Enabled;
 } LEGACY_ENTRY;
@@ -246,6 +246,8 @@ typedef struct {
 typedef struct {
    BOOLEAN     TextOnly;
    BOOLEAN     ScanAllLinux;
+   BOOLEAN     DeepLegacyScan;
+   BOOLEAN     EnableAndLockVMX;
    UINTN       RequestedScreenWidth;
    UINTN       RequestedScreenHeight;
    UINTN       BannerBottomEdge;