1.0.75 release

Update Super UEFIinSecureBoot Disk v3-2
Auto use memdisk mode when booting iKuai OS.
2025-09-16 09:01:15 +00:00 · 2022-05-31 19:22:02 +08:00 · 2022-05-31 18:58:37 +08:00 · 2022-05-31 17:39:54 +08:00 · 2022-05-31 16:42:41 +08:00 · 2022-05-31 14:11:24 +08:00
197 changed files with 5202 additions and 401 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -2,11 +2,11 @@

 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: Ventoy
+open_collective: ventoy
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 custom: ['https://www.paypal.me/ventoy', 'https://www.ventoy.net/en/donation.html'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/ISSUE_TEMPLATE/issue_template.yml
+++ b/.github/ISSUE_TEMPLATE/issue_template.yml
@@ -21,7 +21,7 @@ body:
    attributes:
      label: Ventoy Version
      description: What version of ventoy are you running?
-      placeholder: 1.0.72
+      placeholder: 1.0.75
    validations:
      required: true
  - type: dropdown
--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.c
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.c
@@ -577,7 +577,8 @@ STATIC EFI_STATUS EFIAPI ventoy_find_iso_disk(IN EFI_HANDLE ImageHandle)
            continue;
        }

-        if (CompareMem(g_chain->os_param.vtoy_disk_guid, pBuffer + 0x180, 16) == 0)
+        if (CompareMem(g_chain->os_param.vtoy_disk_guid, pBuffer + 0x180, 16) == 0 &&
+            CompareMem(g_chain->os_param.vtoy_disk_signature, pBuffer + 0x1b8, 4) == 0)
        {
            pMBR = (MBR_HEAD *)pBuffer;
            if (g_os_param_reserved[6] == 0 && pMBR->PartTbl[0].FsFlag != 0xEE)
@@ -599,7 +600,7 @@ STATIC EFI_STATUS EFIAPI ventoy_find_iso_disk(IN EFI_HANDLE ImageHandle)
                              Handles[i],
                              EFI_OPEN_PROTOCOL_GET_PROTOCOL);
            
-            debug("Find Ventoy Disk Handle:%p DP:%s", Handles[i], 
+            debug("Find Ventoy Disk Sig Handle:%p DP:%s", Handles[i], 
                ConvertDevicePathToText(gBlockData.pDiskDevPath, FALSE, FALSE));
            break;
        }
--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.h
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.h
@@ -98,7 +98,9 @@ typedef struct ventoy_os_param
    
    UINT64  vtoy_reserved[4];     // Internal use by ventoy

-    UINT8   reserved[31];
+    UINT8   vtoy_disk_signature[4];
+
+    UINT8   reserved[27];
 }ventoy_os_param;

 #pragma pack()
--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/VentoyProtocol.c
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/VentoyProtocol.c
@@ -155,7 +155,8 @@ STATIC EFI_STATUS EFIAPI ventoy_read_iso_sector
    ventoy_override_chunk *pOverride = g_override_chunk;
    EFI_BLOCK_IO_PROTOCOL *pRawBlockIo = gBlockData.pRawBlockIo;
    
-    debug("read iso sector %lu count %u Buffer:%p Align:%u", Sector, Count, Buffer, pRawBlockIo->Media->IoAlign);
+    debug("read iso sector %lu count %u Buffer:%p Align:%u blk:%u", 
+        Sector, Count, Buffer, pRawBlockIo->Media->IoAlign, pRawBlockIo->Media->BlockSize);

    ReadStart = Sector * 2048;
    ReadEnd = (Sector + Count) * 2048;
@@ -1444,7 +1445,7 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
        AsciiSPrint(TmpName, sizeof(TmpName), "%s", Name);
        for (j = 0; j < 4; j++)
        {
-            if (0 == AsciiStrCmp(g_file_replace_list[i].old_file_name[j], TmpName))
+            if (0 == AsciiStriCmp(g_file_replace_list[i].old_file_name[j], TmpName))
            {
                g_original_fclose(*New);
                *New = &g_efi_file_replace.WrapperHandle;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/Makefile.core.def
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/Makefile.core.def
@@ -913,6 +913,12 @@ module = {
  enable = x86_64_efi;
 };

+module = {
+  name = fwload;
+  efi = commands/efi/fwload.c;
+  enable = efi;
+};
+
 module = {
  name = gptsync;
  common = commands/gptsync.c;
@@ -1123,6 +1129,21 @@ module = {
  common = commands/sleep.c;
 };

+module = {
+  name = smbios;
+
+  common = commands/smbios.c;
+  efi = commands/efi/smbios.c;
+  i386_pc = commands/i386/pc/smbios.c;
+  i386_coreboot = commands/i386/pc/smbios.c;
+  i386_multiboot = commands/i386/pc/smbios.c;
+
+  enable = efi;
+  enable = i386_pc;
+  enable = i386_coreboot;
+  enable = i386_multiboot;
+};
+
 module = {
  name = suspend;
  ieee1275 = commands/ieee1275/suspend.c;
@@ -1622,6 +1643,12 @@ module = {
    common = term/setkey.c;
 };

+module = {
+  name = mouse;
+  efi = term/efi/mouse.c;
+  enable = efi;
+};
+
 module = {
  name = hello;
  common = hello/hello.c;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/efi/fwload.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/efi/fwload.c
@@ -0,0 +1,205 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2022  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <grub/dl.h>
+#include <grub/efi/api.h>
+#include <grub/efi/efi.h>
+#include <grub/err.h>
+#include <grub/extcmd.h>
+#include <grub/file.h>
+#include <grub/i18n.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/types.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+static grub_efi_guid_t loaded_image_guid = GRUB_EFI_LOADED_IMAGE_GUID;
+
+static grub_efi_status_t
+grub_efi_connect_all (void)
+{
+  grub_efi_status_t status;
+  grub_efi_uintn_t handle_count;
+  grub_efi_handle_t *handle_buffer;
+  grub_efi_uintn_t index;
+  grub_efi_boot_services_t *b;
+  grub_dprintf ("efi", "Connecting ...\n");
+  b = grub_efi_system_table->boot_services;
+  status = efi_call_5 (b->locate_handle_buffer,
+                       GRUB_EFI_ALL_HANDLES, NULL, NULL,
+                       &handle_count, &handle_buffer);
+
+  if (status != GRUB_EFI_SUCCESS)
+    return status;
+
+  for (index = 0; index < handle_count; index++)
+  {
+    status = efi_call_4 (b->connect_controller,
+                         handle_buffer[index], NULL, NULL, 1);
+  }
+
+  if (handle_buffer)
+  {
+    efi_call_1 (b->free_pool, handle_buffer);
+  }
+  return GRUB_EFI_SUCCESS;
+}
+
+static grub_err_t
+grub_efi_load_driver (grub_size_t size, void *boot_image, int connect)
+{
+  grub_efi_status_t status;
+  grub_efi_handle_t driver_handle;
+  grub_efi_boot_services_t *b;
+  grub_efi_loaded_image_t *loaded_image;
+
+  b = grub_efi_system_table->boot_services;
+
+  status = efi_call_6 (b->load_image, 0, grub_efi_image_handle, NULL,
+                       boot_image, size, &driver_handle);
+  if (status != GRUB_EFI_SUCCESS)
+  {
+    if (status == GRUB_EFI_OUT_OF_RESOURCES)
+      grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of resources");
+    else
+      grub_error (GRUB_ERR_BAD_OS, "cannot load image");
+    goto fail;
+  }
+  loaded_image = grub_efi_get_loaded_image (driver_handle);
+  if (! loaded_image)
+  {
+    grub_error (GRUB_ERR_BAD_OS, "no loaded image available");
+    goto fail;
+  }
+  grub_dprintf ("efi", "Registering loaded image\n");
+  status = efi_call_3 (b->handle_protocol, driver_handle,
+                       &loaded_image_guid, (void **)&loaded_image);
+  if (status != GRUB_EFI_SUCCESS)
+  {
+    grub_error (GRUB_ERR_BAD_OS, "not a dirver");
+    goto fail;
+  }
+  grub_dprintf ("efi", "StartImage: %p\n", boot_image);
+  status = efi_call_3 (b->start_image, driver_handle, NULL, NULL);
+  if (status != GRUB_EFI_SUCCESS)
+  {
+    grub_error (GRUB_ERR_BAD_OS, "StartImage failed");
+    goto fail;
+  }
+  if (connect)
+  {
+    status = grub_efi_connect_all ();
+    if (status != GRUB_EFI_SUCCESS)
+    {
+      grub_error (GRUB_ERR_BAD_OS, "cannot connect controllers\n");
+      goto fail;
+    }
+  }
+  grub_dprintf ("efi", "Driver installed\n");
+  return 0;
+fail:
+  return grub_errno;
+}
+
+static const struct grub_arg_option options_fwload[] =
+{
+  {"nc", 'n', 0, N_("Loads the driver, but does not connect the driver."), 0, 0},
+  {0, 0, 0, 0, 0, 0}
+};
+
+static grub_err_t
+grub_cmd_fwload (grub_extcmd_context_t ctxt, int argc, char **args)
+{
+  struct grub_arg_list *state = ctxt->state;
+  int connect = 1;
+  grub_file_t file = 0;
+  grub_efi_boot_services_t *b;
+  grub_efi_status_t status;
+  grub_efi_uintn_t pages = 0;
+  grub_ssize_t size;
+  grub_efi_physical_address_t address;
+  void *boot_image = 0;
+
+  b = grub_efi_system_table->boot_services;
+  if (argc != 1)
+    goto fail;
+
+  file = grub_file_open (args[0], GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE);
+  if (! file)
+    goto fail;
+  size = grub_file_size (file);
+  if (!size)
+  {
+    grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), args[0]);
+    goto fail;
+  }
+  pages = (((grub_efi_uintn_t) size + ((1 << 12) - 1)) >> 12);
+  status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ANY_PAGES,
+                       GRUB_EFI_LOADER_CODE, pages, &address);
+  if (status != GRUB_EFI_SUCCESS)
+  {
+    grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
+    goto fail;
+  }
+  boot_image = (void *) ((grub_addr_t) address);
+  if (grub_file_read (file, boot_image, size) != size)
+  {
+    if (grub_errno == GRUB_ERR_NONE)
+      grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), args[0]);
+    goto fail;
+  }
+  grub_file_close (file);
+  if (state[0].set)
+    connect = 0;
+  if (grub_efi_load_driver (size, boot_image, connect))
+    goto fail;
+  return GRUB_ERR_NONE;
+fail:
+  if (file)
+    grub_file_close (file);
+  if (address)
+    efi_call_2 (b->free_pages, address, pages);
+  return grub_errno;
+}
+
+static grub_err_t
+grub_cmd_fwconnect (grub_extcmd_context_t ctxt __attribute__ ((unused)),
+                    int argc __attribute__ ((unused)),
+                    char **args __attribute__ ((unused)))
+{
+  grub_efi_connect_all ();
+  return GRUB_ERR_NONE;
+}
+
+static grub_extcmd_t cmd_fwload, cmd_fwconnect;
+
+GRUB_MOD_INIT(fwload)
+{
+  cmd_fwload = grub_register_extcmd ("fwload", grub_cmd_fwload, 0, N_("FILE"),
+                                     N_("Install UEFI driver."), options_fwload);
+  cmd_fwconnect = grub_register_extcmd ("fwconnect", grub_cmd_fwconnect, 0,
+                                        NULL, N_("Connect drivers."), 0);
+}
+
+GRUB_MOD_FINI(fwload)
+{
+  grub_unregister_extcmd (cmd_fwload);
+  grub_unregister_extcmd (cmd_fwconnect);
+}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/efi/smbios.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/efi/smbios.c
@@ -0,0 +1,61 @@
+/* smbios.c - get smbios tables. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2019  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/smbios.h>
+#include <grub/misc.h>
+#include <grub/efi/efi.h>
+#include <grub/efi/api.h>
+
+struct grub_smbios_eps *
+grub_machine_smbios_get_eps (void)
+{
+  unsigned i;
+  static grub_efi_packed_guid_t smbios_guid = GRUB_EFI_SMBIOS_TABLE_GUID;
+
+  for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
+    {
+      grub_efi_packed_guid_t *guid =
+	&grub_efi_system_table->configuration_table[i].vendor_guid;
+
+      if (! grub_memcmp (guid, &smbios_guid, sizeof (grub_efi_packed_guid_t)))
+	return (struct grub_smbios_eps *)
+	  grub_efi_system_table->configuration_table[i].vendor_table;
+    }
+
+  return 0;
+}
+
+struct grub_smbios_eps3 *
+grub_machine_smbios_get_eps3 (void)
+{
+  unsigned i;
+  static grub_efi_packed_guid_t smbios3_guid = GRUB_EFI_SMBIOS3_TABLE_GUID;
+
+  for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
+    {
+      grub_efi_packed_guid_t *guid =
+	&grub_efi_system_table->configuration_table[i].vendor_guid;
+
+      if (! grub_memcmp (guid, &smbios3_guid, sizeof (grub_efi_packed_guid_t)))
+	return (struct grub_smbios_eps3 *)
+	  grub_efi_system_table->configuration_table[i].vendor_table;
+    }
+
+  return 0;
+}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/i386/pc/smbios.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/i386/pc/smbios.c
@@ -0,0 +1,52 @@
+/* smbios.c - get smbios tables. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2019  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/acpi.h>
+#include <grub/smbios.h>
+#include <grub/misc.h>
+
+struct grub_smbios_eps *
+grub_machine_smbios_get_eps (void)
+{
+  grub_uint8_t *ptr;
+
+  grub_dprintf ("smbios", "Looking for SMBIOS EPS. Scanning BIOS\n");
+
+  for (ptr = (grub_uint8_t *) 0xf0000; ptr < (grub_uint8_t *) 0x100000; ptr += 16)
+    if (grub_memcmp (ptr, "_SM_", 4) == 0
+	&& grub_byte_checksum (ptr, sizeof (struct grub_smbios_eps)) == 0)
+      return (struct grub_smbios_eps *) ptr;
+
+  return 0;
+}
+
+struct grub_smbios_eps3 *
+grub_machine_smbios_get_eps3 (void)
+{
+  grub_uint8_t *ptr;
+
+  grub_dprintf ("smbios", "Looking for SMBIOS3 EPS. Scanning BIOS\n");
+
+  for (ptr = (grub_uint8_t *) 0xf0000; ptr < (grub_uint8_t *) 0x100000; ptr += 16)
+    if (grub_memcmp (ptr, "_SM3_", 5) == 0
+	&& grub_byte_checksum (ptr, sizeof (struct grub_smbios_eps3)) == 0)
+      return (struct grub_smbios_eps3 *) ptr;
+
+  return 0;
+}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/search.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/search.c
@@ -68,7 +68,7 @@ iterate_device (const char *name, void *data)
  /* Skip floppy drives when requested.  */
  if (ctx->no_floppy &&
      name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9')
-    return 1;
+    return 0;

  if (g_no_vtoyefi_part && (grub_strcmp(name, g_vtoyefi_dosname) == 0 || grub_strcmp(name, g_vtoyefi_gptname) == 0)) {
    return 0;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/smbios.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/smbios.c
@@ -0,0 +1,399 @@
+/* smbios.c - retrieve smbios information. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2019  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/dl.h>
+#include <grub/env.h>
+#include <grub/extcmd.h>
+#include <grub/i18n.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/smbios.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+/* Abstract useful values found in either the SMBIOS3 or SMBIOS EPS. */
+static struct {
+  grub_addr_t start;
+  grub_addr_t end;
+  grub_uint16_t structures;
+} table_desc;
+
+static grub_extcmd_t cmd;
+
+/* Locate the SMBIOS entry point structure depending on the hardware. */
+struct grub_smbios_eps *
+grub_smbios_get_eps (void)
+{
+  static struct grub_smbios_eps *eps = NULL;
+
+  if (eps != NULL)
+    return eps;
+
+  eps = grub_machine_smbios_get_eps ();
+
+  return eps;
+}
+
+/* Locate the SMBIOS3 entry point structure depending on the hardware. */
+static struct grub_smbios_eps3 *
+grub_smbios_get_eps3 (void)
+{
+  static struct grub_smbios_eps3 *eps = NULL;
+
+  if (eps != NULL)
+    return eps;
+
+  eps = grub_machine_smbios_get_eps3 ();
+
+  return eps;
+}
+
+static char *
+linux_string (const char *value)
+{
+  char *out = grub_malloc( grub_strlen (value) + 1);
+  const char *src = value;
+  char *dst = out;
+
+  for (; *src; src++)
+    if (*src > ' ' && *src < 127 && *src != ':')
+      *dst++ = *src;
+
+  *dst = 0;
+  return out;
+}
+
+/*
+ * These functions convert values from the various SMBIOS structure field types
+ * into a string formatted to be returned to the user.  They expect that the
+ * structure and offset were already validated.  When the requested data is
+ * successfully retrieved and formatted, the pointer to the string is returned;
+ * otherwise, NULL is returned on failure.  Don't free the result.
+ */
+
+static const char *
+grub_smbios_format_byte (const grub_uint8_t *structure, grub_uint8_t offset)
+{
+  static char buffer[sizeof ("255")];
+
+  grub_snprintf (buffer, sizeof (buffer), "%u", structure[offset]);
+
+  return (const char *)buffer;
+}
+
+static const char *
+grub_smbios_format_word (const grub_uint8_t *structure, grub_uint8_t offset)
+{
+  static char buffer[sizeof ("65535")];
+
+  grub_uint16_t value = grub_get_unaligned16 (structure + offset);
+  grub_snprintf (buffer, sizeof (buffer), "%u", value);
+
+  return (const char *)buffer;
+}
+
+static const char *
+grub_smbios_format_dword (const grub_uint8_t *structure, grub_uint8_t offset)
+{
+  static char buffer[sizeof ("4294967295")];
+
+  grub_uint32_t value = grub_get_unaligned32 (structure + offset);
+  grub_snprintf (buffer, sizeof (buffer), "%" PRIuGRUB_UINT32_T, value);
+
+  return (const char *)buffer;
+}
+
+static const char *
+grub_smbios_format_qword (const grub_uint8_t *structure, grub_uint8_t offset)
+{
+  static char buffer[sizeof ("18446744073709551615")];
+
+  grub_uint64_t value = grub_get_unaligned64 (structure + offset);
+  grub_snprintf (buffer, sizeof (buffer), "%" PRIuGRUB_UINT64_T, value);
+
+  return (const char *)buffer;
+}
+
+static const char *
+grub_smbios_get_string (const grub_uint8_t *structure, grub_uint8_t offset)
+{
+  const grub_uint8_t *ptr = structure + structure[1];
+  const grub_uint8_t *table_end = (const grub_uint8_t *)table_desc.end;
+  const grub_uint8_t referenced_string_number = structure[offset];
+  grub_uint8_t i;
+
+  /* A string referenced with zero is interpreted as unset. */
+  if (referenced_string_number == 0)
+    return NULL;
+
+  /* Search the string set. */
+  for (i = 1; *ptr != 0 && ptr < table_end; i++)
+    if (i == referenced_string_number)
+      {
+        const char *str = (const char *)ptr;
+        while (*ptr++ != 0)
+          if (ptr >= table_end)
+            return NULL; /* The string isn't terminated. */
+        return str;
+      }
+    else
+      while (*ptr++ != 0 && ptr < table_end);
+
+  /* The string number is greater than the number of strings in the set. */
+  return NULL;
+}
+
+static const char *
+grub_smbios_format_uuid (const grub_uint8_t *structure, grub_uint8_t offset)
+{
+  static char buffer[sizeof ("ffffffff-ffff-ffff-ffff-ffffffffffff")];
+  const grub_uint8_t *f = structure + offset; /* little-endian fields */
+  const grub_uint8_t *g = f + 8; /* byte-by-byte fields */
+
+  grub_snprintf (buffer, sizeof (buffer),
+                 "%02x%02x%02x%02x-%02x%02x-%02x%02x-"
+                 "%02x%02x-%02x%02x%02x%02x%02x%02x",
+                 f[3], f[2], f[1], f[0], f[5], f[4], f[7], f[6],
+                 g[0], g[1], g[2], g[3], g[4], g[5], g[6], g[7]);
+
+  return (const char *)buffer;
+}
+
+/* List the field formatting functions and the number of bytes they need. */
+static const struct {
+  const char *(*format) (const grub_uint8_t *structure, grub_uint8_t offset);
+  grub_uint8_t field_length;
+} field_extractors[] = {
+  {grub_smbios_format_byte, 1},
+  {grub_smbios_format_word, 2},
+  {grub_smbios_format_dword, 4},
+  {grub_smbios_format_qword, 8},
+  {grub_smbios_get_string, 1},
+  {grub_smbios_format_uuid, 16}
+};
+
+/* List command options, with structure field getters ordered as above. */
+#define FIRST_GETTER_OPT (3)
+#define SETTER_OPT (FIRST_GETTER_OPT + ARRAY_SIZE(field_extractors))
+#define LINUX_OPT (FIRST_GETTER_OPT + ARRAY_SIZE(field_extractors) + 1)
+
+static const struct grub_arg_option options[] = {
+  {"type",       't', 0, N_("Match structures with the given type."),
+                         N_("type"), ARG_TYPE_INT},
+  {"handle",     'h', 0, N_("Match structures with the given handle."),
+                         N_("handle"), ARG_TYPE_INT},
+  {"match",      'm', 0, N_("Select a structure when several match."),
+                         N_("match"), ARG_TYPE_INT},
+  {"get-byte",   'b', 0, N_("Get the byte's value at the given offset."),
+                         N_("offset"), ARG_TYPE_INT},
+  {"get-word",   'w', 0, N_("Get two bytes' value at the given offset."),
+                         N_("offset"), ARG_TYPE_INT},
+  {"get-dword",  'd', 0, N_("Get four bytes' value at the given offset."),
+                         N_("offset"), ARG_TYPE_INT},
+  {"get-qword",  'q', 0, N_("Get eight bytes' value at the given offset."),
+                         N_("offset"), ARG_TYPE_INT},
+  {"get-string", 's', 0, N_("Get the string specified at the given offset."),
+                         N_("offset"), ARG_TYPE_INT},
+  {"get-uuid",   'u', 0, N_("Get the UUID's value at the given offset."),
+                         N_("offset"), ARG_TYPE_INT},
+  {"set",       '\0', 0, N_("Store the value in the given variable name."),
+                         N_("variable"), ARG_TYPE_STRING},
+  {"linux",     '\0', 0, N_("Filter the result like linux does."),
+                         N_("variable"), ARG_TYPE_NONE},
+  {0, 0, 0, 0, 0, 0}
+};
+
+/*
+ * Return a matching SMBIOS structure.
+ *
+ * This method can use up to three criteria for selecting a structure:
+ *   - The "type" field                  (use -1 to ignore)
+ *   - The "handle" field                (use -1 to ignore)
+ *   - Which to return if several match  (use  0 to ignore)
+ *
+ * The return value is a pointer to the first matching structure.  If no
+ * structures match the given parameters, NULL is returned.
+ */
+static const grub_uint8_t *
+grub_smbios_match_structure (const grub_int16_t type,
+                             const grub_int32_t handle,
+                             const grub_uint16_t match)
+{
+  const grub_uint8_t *ptr = (const grub_uint8_t *)table_desc.start;
+  const grub_uint8_t *table_end = (const grub_uint8_t *)table_desc.end;
+  grub_uint16_t structures = table_desc.structures;
+  grub_uint16_t structure_count = 0;
+  grub_uint16_t matches = 0;
+
+  while (ptr < table_end
+         && ptr[1] >= 4 /* Valid structures include the 4-byte header. */
+         && (structure_count++ < structures || structures == 0))
+    {
+      grub_uint16_t structure_handle = grub_get_unaligned16 (ptr + 2);
+      grub_uint8_t structure_type = ptr[0];
+
+      if ((handle < 0 || handle == structure_handle)
+          && (type < 0 || type == structure_type)
+          && (match == 0 || match == ++matches))
+        return ptr;
+      else
+        {
+          ptr += ptr[1];
+          while ((*ptr++ != 0 || *ptr++ != 0) && ptr < table_end);
+        }
+
+      if (structure_type == GRUB_SMBIOS_TYPE_END_OF_TABLE)
+        break;
+    }
+
+  return NULL;
+}
+
+static grub_err_t
+grub_cmd_smbios (grub_extcmd_context_t ctxt,
+                 int argc __attribute__ ((unused)),
+                 char **argv __attribute__ ((unused)))
+{
+  struct grub_arg_list *state = ctxt->state;
+
+  grub_int16_t type = -1;
+  grub_int32_t handle = -1;
+  grub_uint16_t match = 0;
+  grub_uint8_t offset = 0;
+
+  const grub_uint8_t *structure;
+  const char *value;
+  char *modified_value = NULL;
+  grub_int32_t option;
+  grub_int8_t field_type = -1;
+  grub_uint8_t i;
+
+  if (table_desc.start == 0)
+    return grub_error (GRUB_ERR_IO,
+                       N_("the SMBIOS entry point structure was not found"));
+
+  /* Read the given filtering options. */
+  if (state[0].set)
+    {
+      option = grub_strtol (state[0].arg, NULL, 0);
+      if (option < 0 || option > 255)
+        return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                           N_("the type must be between 0 and 255"));
+      type = (grub_int16_t)option;
+    }
+  if (state[1].set)
+    {
+      option = grub_strtol (state[1].arg, NULL, 0);
+      if (option < 0 || option > 65535)
+        return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                           N_("the handle must be between 0 and 65535"));
+      handle = (grub_int32_t)option;
+    }
+  if (state[2].set)
+    {
+      option = grub_strtol (state[2].arg, NULL, 0);
+      if (option <= 0 || option > 65535)
+        return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                           N_("the match must be a positive integer"));
+      match = (grub_uint16_t)option;
+    }
+
+  /* Determine the data type of the structure field to retrieve. */
+  for (i = 0; i < ARRAY_SIZE(field_extractors); i++)
+    if (state[FIRST_GETTER_OPT + i].set)
+      {
+        if (field_type >= 0)
+          return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                             N_("only one --get option is usable at a time"));
+        field_type = i;
+      }
+
+  /* Require a choice of a structure field to return. */
+  if (field_type < 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                       N_("one of the --get options is required"));
+
+  /* Locate a matching SMBIOS structure. */
+  structure = grub_smbios_match_structure (type, handle, match);
+  if (structure == NULL)
+    return grub_error (GRUB_ERR_IO,
+                       N_("no structure matched the given options"));
+
+  /* Ensure the requested byte offset is inside the structure. */
+  option = grub_strtol (state[FIRST_GETTER_OPT + field_type].arg, NULL, 0);
+  if (option < 0 || option >= structure[1])
+    return grub_error (GRUB_ERR_OUT_OF_RANGE,
+                       N_("the given offset is outside the structure"));
+
+  /* Ensure the requested data type at the offset is inside the structure. */
+  offset = (grub_uint8_t)option;
+  if (offset + field_extractors[field_type].field_length > structure[1])
+    return grub_error (GRUB_ERR_OUT_OF_RANGE,
+                       N_("the field ends outside the structure"));
+
+  /* Format the requested structure field into a readable string. */
+  value = field_extractors[field_type].format (structure, offset);
+  if (value == NULL)
+    return grub_error (GRUB_ERR_IO,
+                       N_("failed to retrieve the structure field"));
+
+  if (state[LINUX_OPT].set)
+    value = modified_value = linux_string (value);
+
+  /* Store or print the formatted value. */
+  if (state[SETTER_OPT].set)
+    grub_env_set (state[SETTER_OPT].arg, value);
+  else
+    grub_printf ("%s\n", value);
+
+  grub_free(modified_value);
+
+  return GRUB_ERR_NONE;
+}
+
+GRUB_MOD_INIT(smbios)
+{
+  struct grub_smbios_eps3 *eps3;
+  struct grub_smbios_eps *eps;
+
+  if ((eps3 = grub_smbios_get_eps3 ()))
+    {
+      table_desc.start = (grub_addr_t)eps3->table_address;
+      table_desc.end = table_desc.start + eps3->maximum_table_length;
+      table_desc.structures = 0; /* SMBIOS3 drops the structure count. */
+    }
+  else if ((eps = grub_smbios_get_eps ()))
+    {
+      table_desc.start = (grub_addr_t)eps->intermediate.table_address;
+      table_desc.end = table_desc.start + eps->intermediate.table_length;
+      table_desc.structures = eps->intermediate.structures;
+    }
+
+  cmd = grub_register_extcmd ("smbios", grub_cmd_smbios, 0,
+                              N_("[-t type] [-h handle] [-m match] "
+                                 "(-b|-w|-d|-q|-s|-u) offset "
+                                 "[--set variable]"),
+                              N_("Retrieve SMBIOS information."), options);
+}
+
+GRUB_MOD_FINI(smbios)
+{
+  grub_unregister_extcmd (cmd);
+}
+
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/fshelp.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/fshelp.c
@@ -426,7 +426,7 @@ grub_fshelp_read_file (grub_disk_t disk, grub_fshelp_node_t node,
 	  if (grub_errno)
 	    return -1;
 	}
-      else if (read_hook != (grub_disk_read_hook_t)grub_disk_blocklist_read)
+      else if (read_hook != (grub_disk_read_hook_t)(void *)grub_disk_blocklist_read)
 	grub_memset (buf, 0, blockend);

      buf += blocksize - skipfirst;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/gfxmenu.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/gfxmenu.c
@@ -119,6 +119,8 @@ grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
  view->menu = menu;
  view->nested = nested;
  view->first_timeout = -1;
+  if (menu->size)
+    view->menu_title_offset = grub_zalloc (sizeof (*view->menu_title_offset) * menu->size);

  grub_video_set_viewport (0, 0, mode_info.width, mode_info.height);
  if (view->double_repaint)
@@ -134,6 +136,8 @@ grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
  instance->fini = grub_gfxmenu_viewer_fini;
  instance->print_timeout = grub_gfxmenu_print_timeout;
  instance->clear_timeout = grub_gfxmenu_clear_timeout;
+  if (view->menu_title_offset)
+    instance->scroll_chosen_entry = grub_gfxmenu_scroll_chosen_entry;

  grub_menu_register_viewer (instance);

--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/gui_list.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/gui_list.c
@@ -0,0 +1,961 @@
+/* gui_list.c - GUI component to display a selectable list of items.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/gui.h>
+#include <grub/gui_string_util.h>
+#include <grub/gfxmenu_view.h>
+#include <grub/gfxwidgets.h>
+#include <grub/color.h>
+#include <grub/charset.h>
+
+enum scrollbar_slice_mode {
+  SCROLLBAR_SLICE_WEST,
+  SCROLLBAR_SLICE_CENTER,
+  SCROLLBAR_SLICE_EAST
+};
+
+struct grub_gui_list_impl
+{
+  struct grub_gui_list list;
+
+  grub_gui_container_t parent;
+  grub_video_rect_t bounds;
+  char *id;
+  int visible;
+
+  int icon_width;
+  int icon_height;
+  int item_height;
+  int item_padding;
+  int item_icon_space;
+  int item_spacing;
+  grub_font_t item_font;
+  int selected_item_font_inherit;
+  grub_font_t selected_item_font;
+  grub_video_rgba_color_t item_color;
+  int selected_item_color_inherit;
+  grub_video_rgba_color_t selected_item_color;
+
+  int draw_scrollbar;
+  int need_to_recreate_scrollbar;
+  char *scrollbar_frame_pattern;
+  char *scrollbar_thumb_pattern;
+  grub_gfxmenu_box_t scrollbar_frame;
+  grub_gfxmenu_box_t scrollbar_thumb;
+  int scrollbar_thumb_overlay;
+  int scrollbar_width;
+  enum scrollbar_slice_mode scrollbar_slice;
+  int scrollbar_left_pad;
+  int scrollbar_right_pad;
+  int scrollbar_top_pad;
+  int scrollbar_bottom_pad;
+
+  int first_shown_index;
+
+  int need_to_recreate_boxes;
+  char *theme_dir;
+  char *menu_box_pattern;
+  char *item_box_pattern;
+  int selected_item_box_pattern_inherit;
+  char *selected_item_box_pattern;
+  grub_gfxmenu_box_t menu_box;
+  grub_gfxmenu_box_t selected_item_box;
+  grub_gfxmenu_box_t item_box;
+
+  grub_gfxmenu_icon_manager_t icon_manager;
+
+  grub_gfxmenu_view_t view;
+};
+
+typedef struct grub_gui_list_impl *list_impl_t;
+
+static void
+list_destroy (void *vself)
+{
+  list_impl_t self = vself;
+
+  grub_free (self->theme_dir);
+  grub_free (self->menu_box_pattern);
+  grub_free (self->item_box_pattern);
+  grub_free (self->selected_item_box_pattern);
+  if (self->menu_box)
+    self->menu_box->destroy (self->menu_box);
+  if (self->item_box)
+    self->item_box->destroy (self->item_box);
+  if (self->selected_item_box)
+    self->selected_item_box->destroy (self->selected_item_box);
+  if (self->icon_manager)
+    grub_gfxmenu_icon_manager_destroy (self->icon_manager);
+  if (self->scrollbar_thumb)
+    self->scrollbar_thumb->destroy (self->scrollbar_thumb);
+  if (self->scrollbar_frame)
+    self->scrollbar_frame->destroy (self->scrollbar_frame);
+  grub_free (self->scrollbar_thumb_pattern);
+  grub_free (self->scrollbar_frame_pattern);
+  grub_free (self);
+}
+
+static int
+get_num_shown_items (list_impl_t self)
+{
+  int boxpad = self->item_padding;
+  int item_vspace = self->item_spacing;
+  int item_height = self->item_height;
+  
+  grub_gfxmenu_box_t box = self->menu_box;
+  int box_top_pad = box->get_top_pad (box);
+  int box_bottom_pad = box->get_bottom_pad (box);
+  grub_gfxmenu_box_t itembox = self->item_box;
+  grub_gfxmenu_box_t selbox = self->selected_item_box;
+  int item_top_pad = itembox->get_top_pad (itembox);
+  int item_bottom_pad = itembox->get_bottom_pad (itembox);
+  int sel_top_pad = selbox->get_top_pad (selbox);
+  int sel_bottom_pad = selbox->get_bottom_pad (selbox);
+  int max_top_pad = grub_max (item_top_pad, sel_top_pad);
+  int max_bottom_pad = grub_max (item_bottom_pad, sel_bottom_pad);
+
+  if (item_height + item_vspace <= 0)
+    return 1;
+
+  return (self->bounds.height + item_vspace - 2 * boxpad
+          - max_top_pad - max_bottom_pad
+          - box_top_pad - box_bottom_pad) / (item_height + item_vspace);
+}
+
+static int
+check_boxes (list_impl_t self)
+{
+  if (self->need_to_recreate_boxes)
+    {
+      grub_gui_recreate_box (&self->menu_box,
+                             self->menu_box_pattern,
+                             self->theme_dir);
+
+      grub_gui_recreate_box (&self->item_box,
+                             self->item_box_pattern,
+                             self->theme_dir);
+
+      grub_gui_recreate_box (&self->selected_item_box,
+                             self->selected_item_box_pattern,
+                             self->theme_dir);
+
+      self->need_to_recreate_boxes = 0;
+    }
+
+  return (self->menu_box != 0 && self->selected_item_box != 0
+          && self->item_box != 0);
+}
+
+static int
+check_scrollbar (list_impl_t self)
+{
+  if (self->need_to_recreate_scrollbar)
+    {
+      grub_gui_recreate_box (&self->scrollbar_frame,
+                             self->scrollbar_frame_pattern,
+                             self->theme_dir);
+
+      grub_gui_recreate_box (&self->scrollbar_thumb,
+                             self->scrollbar_thumb_pattern,
+                             self->theme_dir);
+
+      self->need_to_recreate_scrollbar = 0;
+    }
+
+  if (self->scrollbar_frame == 0 || self->scrollbar_thumb == 0)
+    return 0;
+
+  /* Sanity checks. */
+  grub_gfxmenu_box_t frame = self->scrollbar_frame;
+  grub_gfxmenu_box_t thumb = self->scrollbar_thumb;
+  grub_gfxmenu_box_t menu = self->menu_box;
+  int min_width = frame->get_left_pad (frame)
+                  + frame->get_right_pad (frame);
+  int min_height = frame->get_top_pad (frame)
+                   + frame->get_bottom_pad (frame)
+                   + self->scrollbar_top_pad + self->scrollbar_bottom_pad
+                   + menu->get_top_pad (menu)
+                   + menu->get_bottom_pad (menu);
+  if (!self->scrollbar_thumb_overlay)
+    {
+      min_width += thumb->get_left_pad (thumb)
+                   + thumb->get_right_pad (thumb);
+      min_height += thumb->get_top_pad (thumb)
+                    + thumb->get_bottom_pad (thumb);
+    }
+  if (min_width <= self->scrollbar_width
+      && min_height <= (int) self->bounds.height)
+    return 1;
+
+  /* Unprintable dimenstions. */
+  self->draw_scrollbar = 0;
+  return 0;
+}
+
+static const char *
+list_get_id (void *vself)
+{
+  list_impl_t self = vself;
+  return self->id;
+}
+
+static int
+list_is_instance (void *vself __attribute__((unused)), const char *type)
+{
+  return (grub_strcmp (type, "component") == 0
+          || grub_strcmp (type, "list") == 0);
+}
+
+static struct grub_video_bitmap *
+get_item_icon (list_impl_t self, int item_index)
+{
+  grub_menu_entry_t entry;
+  entry = grub_menu_get_entry (self->view->menu, item_index);
+  if (! entry)
+    return 0;
+
+  return grub_gfxmenu_icon_manager_get_icon (self->icon_manager, entry);
+}
+
+static void
+make_selected_item_visible (list_impl_t self)
+{
+  int selected_index = self->view->selected;
+  if (selected_index < 0)
+    return;   /* No item is selected.  */
+  int num_shown_items = get_num_shown_items (self);
+  int last_shown_index = self->first_shown_index + (num_shown_items - 1);
+  if (selected_index < self->first_shown_index)
+    self->first_shown_index = selected_index;
+  else if (selected_index > last_shown_index)
+    self->first_shown_index = selected_index - (num_shown_items - 1);
+}
+
+/* Draw a scrollbar on the menu.  */
+static void
+draw_scrollbar (list_impl_t self,
+                int value, int extent, int min, int max,
+                int scrollbar_width, int scrollbar_height)
+{
+  unsigned thumby, thumbheight;
+
+  grub_gfxmenu_box_t frame = self->scrollbar_frame;
+  grub_gfxmenu_box_t thumb = self->scrollbar_thumb;
+  int frame_vertical_pad = (frame->get_top_pad (frame)
+                            + frame->get_bottom_pad (frame));
+  int frame_horizontal_pad = (frame->get_left_pad (frame)
+                              + frame->get_right_pad (frame));
+  unsigned thumb_vertical_pad = (thumb->get_top_pad (thumb)
+				 + thumb->get_bottom_pad (thumb));
+  int thumb_horizontal_pad = (thumb->get_left_pad (thumb)
+                              + thumb->get_right_pad (thumb));
+  int tracktop = frame->get_top_pad (frame);
+  unsigned tracklen;
+  if (scrollbar_height <= frame_vertical_pad)
+    tracklen = 0;
+  else
+    tracklen = scrollbar_height - frame_vertical_pad;
+  frame->set_content_size (frame,
+                           scrollbar_width - frame_horizontal_pad,
+                           tracklen);
+  if (self->scrollbar_thumb_overlay)
+    {
+      tracklen += thumb_vertical_pad;
+      tracktop -= thumb->get_top_pad (thumb);
+    }
+  if (value <= min || max <= min)
+    thumby = 0;
+  else
+    thumby = ((unsigned) tracklen * (value - min))
+      / ((unsigned) (max - min));
+  if (max <= min)
+    thumbheight = 1;
+  else
+    thumbheight = ((unsigned) (tracklen * extent)
+		   / ((unsigned) (max - min))) + 1;
+  /* Rare occasion: too many entries or too low height. */
+  if (thumbheight < thumb_vertical_pad)
+    {
+      thumbheight = thumb_vertical_pad;
+      if (value <= min || max <= extent
+	  || tracklen <= thumb_vertical_pad)
+	thumby = 0;
+      else
+	thumby = ((unsigned) ((tracklen - thumb_vertical_pad) * (value - min))
+		  / ((unsigned)(max - extent)));
+    }
+  thumby += tracktop;
+  int thumbx = frame->get_left_pad (frame);
+  int thumbwidth = scrollbar_width - frame_horizontal_pad;
+  if (!self->scrollbar_thumb_overlay)
+    thumbwidth -= thumb_horizontal_pad;
+  else
+    thumbx -= thumb->get_left_pad (thumb);
+  thumb->set_content_size (thumb, thumbwidth,
+                           thumbheight - thumb_vertical_pad);
+  frame->draw (frame, 0, 0);
+  thumb->draw (thumb, thumbx, thumby);
+}
+
+/* Draw the list of items.  */
+static void
+draw_menu (list_impl_t self, int num_shown_items)
+{
+  if (! self->menu_box || ! self->selected_item_box || ! self->item_box)
+    return;
+
+  int boxpad = self->item_padding;
+  int icon_text_space = self->item_icon_space;
+  int item_vspace = self->item_spacing;
+
+  int ascent = grub_font_get_ascent (self->item_font);
+  int descent = grub_font_get_descent (self->item_font);
+  int selected_ascent = grub_font_get_ascent (self->selected_item_font);
+  int selected_descent = grub_font_get_descent (self->selected_item_font);
+  int text_box_height = self->item_height;
+
+  make_selected_item_visible (self);
+
+  grub_gfxmenu_box_t itembox = self->item_box;
+  grub_gfxmenu_box_t selbox = self->selected_item_box;
+  int item_leftpad = itembox->get_left_pad (itembox);
+  int item_rightpad = itembox->get_right_pad (itembox);
+  int item_border_width = item_leftpad + item_rightpad;
+  int item_toppad = itembox->get_top_pad (itembox);
+  int sel_leftpad = selbox->get_left_pad (selbox);
+  int sel_rightpad = selbox->get_right_pad (selbox);
+  int sel_border_width = sel_leftpad + sel_rightpad;
+  int sel_toppad = selbox->get_top_pad (selbox);
+
+  int max_leftpad = grub_max (item_leftpad, sel_leftpad);
+  int max_toppad = grub_max (item_toppad, sel_toppad);
+  int item_top = 0;
+  int menu_index;
+  int visible_index;
+  struct grub_video_rect oviewport;
+
+  grub_video_get_viewport (&oviewport.x, &oviewport.y,
+			   &oviewport.width, &oviewport.height);
+  grub_video_set_viewport (oviewport.x + boxpad, 
+			   oviewport.y + boxpad,
+			   oviewport.width - 2 * boxpad,
+			   oviewport.height - 2 * boxpad);
+
+  int cwidth = oviewport.width - 2 * boxpad;
+
+  itembox->set_content_size (itembox, cwidth - item_border_width,
+                             text_box_height);
+  selbox->set_content_size (selbox, cwidth - sel_border_width,
+                            text_box_height);
+
+  int text_left_offset = self->icon_width + icon_text_space;
+  int item_text_top_offset = (text_box_height - (ascent + descent)) / 2 + ascent;
+  int sel_text_top_offset = (text_box_height - (selected_ascent
+                                                + selected_descent)) / 2
+                                 + selected_ascent;
+
+  grub_video_rect_t svpsave, sviewport;
+  sviewport.x = max_leftpad + text_left_offset;
+  int text_viewport_width = cwidth - sviewport.x;
+  sviewport.height = text_box_height;
+
+  grub_video_color_t item_color;
+  grub_video_color_t sel_color;
+  item_color = grub_video_map_rgba_color (self->item_color);
+  sel_color = grub_video_map_rgba_color (self->selected_item_color);
+
+  int item_box_top_offset = max_toppad - item_toppad;
+  int sel_box_top_offset = max_toppad - sel_toppad;
+  int item_viewport_width = text_viewport_width - item_rightpad;
+  int sel_viewport_width = text_viewport_width - sel_rightpad;
+  int tmp_icon_top_offset = (text_box_height - self->icon_height) / 2;
+  int item_icon_top_offset = item_toppad + tmp_icon_top_offset;
+  int sel_icon_top_offset = sel_toppad + tmp_icon_top_offset;
+
+  for (visible_index = 0, menu_index = self->first_shown_index;
+       visible_index < num_shown_items && menu_index < self->view->menu->size;
+       visible_index++, menu_index++)
+    {
+      int is_selected = (menu_index == self->view->selected);
+      struct grub_video_bitmap *icon;
+      grub_font_t font;
+      grub_video_color_t color;
+      int text_top_offset;
+      int top_pad;
+      int icon_top_offset;
+      int viewport_width;
+
+      if (is_selected)
+        {
+          selbox->draw (selbox, 0, item_top + sel_box_top_offset);
+          font = self->selected_item_font;
+          color = sel_color;
+          text_top_offset = sel_text_top_offset;
+          top_pad = sel_toppad;
+          icon_top_offset = sel_icon_top_offset;
+          viewport_width = sel_viewport_width;
+        }
+      else
+        {
+          itembox->draw (itembox, 0, item_top + item_box_top_offset);
+          font = self->item_font;
+          color = item_color;
+          text_top_offset = item_text_top_offset;
+          top_pad = item_toppad;
+          icon_top_offset = item_icon_top_offset;
+          viewport_width = item_viewport_width;
+        }
+
+      icon = get_item_icon (self, menu_index);
+      if (icon != 0)
+        grub_video_blit_bitmap (icon, GRUB_VIDEO_BLIT_BLEND,
+                                max_leftpad,
+                                item_top + icon_top_offset,
+                                0, 0, self->icon_width, self->icon_height);
+
+      const char *item_title =
+        grub_menu_get_entry (self->view->menu, menu_index)->title;
+
+
+      int off = self->view->menu_title_offset[menu_index];
+      const char *scrolled_title =
+        grub_utf8_offset_code (item_title, grub_strlen (item_title), off);
+      if (scrolled_title)
+        item_title = scrolled_title;
+
+      sviewport.y = item_top + top_pad;
+      sviewport.width = viewport_width;
+      grub_gui_set_viewport (&sviewport, &svpsave);
+      grub_font_draw_string (item_title,
+                             font,
+                             color,
+                             0,
+                             text_top_offset);
+      grub_gui_restore_viewport (&svpsave);
+
+      item_top += text_box_height + item_vspace;
+    }
+  grub_video_set_viewport (oviewport.x,
+			   oviewport.y,
+			   oviewport.width,
+			   oviewport.height);
+}
+
+static void
+list_paint (void *vself, const grub_video_rect_t *region)
+{
+  list_impl_t self = vself;
+  grub_video_rect_t vpsave;
+
+  if (! self->visible)
+    return;
+  if (!grub_video_have_common_points (region, &self->bounds))
+    return;
+
+  check_boxes (self);
+
+  if (! self->menu_box || ! self->selected_item_box || ! self->item_box)
+    return;
+
+  grub_gui_set_viewport (&self->bounds, &vpsave);
+  {
+    grub_gfxmenu_box_t box = self->menu_box;
+    int box_left_pad = box->get_left_pad (box);
+    int box_top_pad = box->get_top_pad (box);
+    int box_right_pad = box->get_right_pad (box);
+    int box_bottom_pad = box->get_bottom_pad (box);
+    grub_video_rect_t vpsave2, content_rect;
+    int num_shown_items = get_num_shown_items (self);
+    int drawing_scrollbar = (self->draw_scrollbar
+			     && (num_shown_items < self->view->menu->size)
+			     && check_scrollbar (self));
+    int scrollbar_width = self->scrollbar_width;
+
+    content_rect.x = box_left_pad;
+    content_rect.y = box_top_pad;
+    content_rect.width = self->bounds.width - box_left_pad - box_right_pad;
+    content_rect.height = self->bounds.height - box_top_pad - box_bottom_pad;
+
+    box->set_content_size (box, content_rect.width, content_rect.height);
+
+    box->draw (box, 0, 0);
+
+    switch (self->scrollbar_slice)
+      {
+        case SCROLLBAR_SLICE_WEST:
+          content_rect.x += self->scrollbar_right_pad;
+          content_rect.width -= self->scrollbar_right_pad;
+          break;
+        case SCROLLBAR_SLICE_CENTER:
+          if (drawing_scrollbar)
+            content_rect.width -= scrollbar_width + self->scrollbar_left_pad
+                                  + self->scrollbar_right_pad;
+          break;
+        case SCROLLBAR_SLICE_EAST:
+          content_rect.width -= self->scrollbar_left_pad;
+          break;
+      }
+
+    grub_gui_set_viewport (&content_rect, &vpsave2);
+    draw_menu (self, num_shown_items);
+    grub_gui_restore_viewport (&vpsave2);
+
+    if (drawing_scrollbar)
+      {
+        content_rect.y += self->scrollbar_top_pad;
+        content_rect.height -= self->scrollbar_top_pad
+                               + self->scrollbar_bottom_pad;
+        content_rect.width = scrollbar_width;
+        switch (self->scrollbar_slice)
+          {
+            case SCROLLBAR_SLICE_WEST:
+              if (box_left_pad > scrollbar_width)
+                {
+                  content_rect.x = box_left_pad - scrollbar_width;
+                  content_rect.width = scrollbar_width;
+                }
+              else
+                {
+                  content_rect.x = 0;
+                  content_rect.width = box_left_pad;
+                }
+              break;
+            case SCROLLBAR_SLICE_CENTER:
+              content_rect.x = self->bounds.width - box_right_pad
+                               - scrollbar_width - self->scrollbar_right_pad;
+              content_rect.width = scrollbar_width;
+              break;
+            case SCROLLBAR_SLICE_EAST:
+              content_rect.x = self->bounds.width - box_right_pad;
+              content_rect.width = box_right_pad;
+              break;
+          }
+
+        grub_gui_set_viewport (&content_rect, &vpsave2);
+        draw_scrollbar (self,
+                        self->first_shown_index, num_shown_items,
+                        0, self->view->menu->size,
+                        scrollbar_width,
+                        content_rect.height);
+        grub_gui_restore_viewport (&vpsave2);
+      }
+  }
+
+  grub_gui_restore_viewport (&vpsave);
+}
+
+static void
+list_set_parent (void *vself, grub_gui_container_t parent)
+{
+  list_impl_t self = vself;
+  self->parent = parent;
+}
+
+static grub_gui_container_t
+list_get_parent (void *vself)
+{
+  list_impl_t self = vself;
+  return self->parent;
+}
+
+static void
+list_set_bounds (void *vself, const grub_video_rect_t *bounds)
+{
+  list_impl_t self = vself;
+  self->bounds = *bounds;
+}
+
+static void
+list_get_bounds (void *vself, grub_video_rect_t *bounds)
+{
+  list_impl_t self = vself;
+  *bounds = self->bounds;
+}
+
+static void
+list_get_minimal_size (void *vself, unsigned *width, unsigned *height)
+{
+  list_impl_t self = vself;
+
+  if (check_boxes (self))
+    {
+      int boxpad = self->item_padding;
+      int item_vspace = self->item_spacing;
+      int item_height = self->item_height;
+      int num_items = 3;
+
+      grub_gfxmenu_box_t box = self->menu_box;
+      int box_left_pad = box->get_left_pad (box);
+      int box_top_pad = box->get_top_pad (box);
+      int box_right_pad = box->get_right_pad (box);
+      int box_bottom_pad = box->get_bottom_pad (box);
+      unsigned width_s;
+
+      grub_gfxmenu_box_t selbox = self->selected_item_box;
+      int sel_top_pad = selbox->get_top_pad (selbox);
+      int sel_bottom_pad = selbox->get_bottom_pad (selbox);
+      int sel_left_pad = selbox->get_left_pad (selbox);
+      int sel_right_pad = selbox->get_right_pad (selbox);
+
+      grub_gfxmenu_box_t itembox = self->item_box;
+      int item_top_pad = itembox->get_top_pad (itembox);
+      int item_bottom_pad = itembox->get_bottom_pad (itembox);
+      int item_left_pad = itembox->get_left_pad (itembox);
+      int item_right_pad = itembox->get_right_pad (itembox);
+
+      int max_left_pad = grub_max (item_left_pad, sel_left_pad);
+      int max_right_pad = grub_max (item_right_pad, sel_right_pad);
+      int max_top_pad = grub_max (item_top_pad, sel_top_pad);
+      int max_bottom_pad = grub_max (item_bottom_pad, sel_bottom_pad);
+
+      *width = grub_font_get_string_width (self->item_font, "Typical OS");
+      width_s = grub_font_get_string_width (self->selected_item_font,
+					    "Typical OS");
+      if (*width < width_s)
+	*width = width_s;
+
+      *width += 2 * boxpad + box_left_pad + box_right_pad
+                + max_left_pad + max_right_pad
+                + self->item_icon_space + self->icon_width;
+
+      switch (self->scrollbar_slice)
+        {
+          case SCROLLBAR_SLICE_WEST:
+            *width += self->scrollbar_right_pad;
+            break;
+          case SCROLLBAR_SLICE_CENTER:
+            *width += self->scrollbar_width + self->scrollbar_left_pad
+                      + self->scrollbar_right_pad;
+            break;
+          case SCROLLBAR_SLICE_EAST:
+            *width += self->scrollbar_left_pad;
+            break;
+        }
+
+      /* Set the menu box height to fit the items.  */
+      *height = (item_height * num_items
+                 + item_vspace * (num_items - 1)
+                 + 2 * boxpad
+                 + box_top_pad + box_bottom_pad
+                 + max_top_pad + max_bottom_pad);
+    }
+  else
+    {
+      *width = 0;
+      *height = 0;
+    }
+}
+
+static grub_err_t
+list_set_property (void *vself, const char *name, const char *value)
+{
+  list_impl_t self = vself;
+  if (grub_strcmp (name, "item_font") == 0)
+    {
+      self->item_font = grub_font_get (value);
+      if (self->selected_item_font_inherit)
+        self->selected_item_font = self->item_font;
+    }
+  else if (grub_strcmp (name, "selected_item_font") == 0)
+    {
+      if (! value || grub_strcmp (value, "inherit") == 0)
+        {
+          self->selected_item_font = self->item_font;
+          self->selected_item_font_inherit = 1;
+        }
+      else
+        {
+          self->selected_item_font = grub_font_get (value);
+          self->selected_item_font_inherit = 0;
+        }
+    }
+  else if (grub_strcmp (name, "item_color") == 0)
+    {
+      grub_video_rgba_color_t color;
+      if (grub_video_parse_color (value, &color) == GRUB_ERR_NONE)
+        {
+          self->item_color = color;
+          if (self->selected_item_color_inherit)
+            self->selected_item_color = self->item_color;
+        }
+    }
+  else if (grub_strcmp (name, "selected_item_color") == 0)
+    {
+      if (! value || grub_strcmp (value, "inherit") == 0)
+        {
+          self->selected_item_color = self->item_color;
+          self->selected_item_color_inherit = 1;
+        }
+      else
+        {
+          grub_video_rgba_color_t color;
+          if (grub_video_parse_color (value, &color)
+              == GRUB_ERR_NONE)
+            {
+              self->selected_item_color = color;
+              self->selected_item_color_inherit = 0;
+            }
+        }
+    }
+  else if (grub_strcmp (name, "icon_width") == 0)
+    {
+      self->icon_width = grub_strtol (value, 0, 10);
+      grub_gfxmenu_icon_manager_set_icon_size (self->icon_manager,
+                                               self->icon_width,
+                                               self->icon_height);
+    }
+  else if (grub_strcmp (name, "icon_height") == 0)
+    {
+      self->icon_height = grub_strtol (value, 0, 10);
+      grub_gfxmenu_icon_manager_set_icon_size (self->icon_manager,
+                                               self->icon_width,
+                                               self->icon_height);
+    }
+  else if (grub_strcmp (name, "item_height") == 0)
+    {
+      self->item_height = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "item_padding") == 0)
+    {
+      self->item_padding = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "item_icon_space") == 0)
+    {
+      self->item_icon_space = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "item_spacing") == 0)
+    {
+      self->item_spacing = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "visible") == 0)
+    {
+      self->visible = grub_strcmp (value, "false") != 0;
+    }
+  else if (grub_strcmp (name, "menu_pixmap_style") == 0)
+    {
+      self->need_to_recreate_boxes = 1;
+      grub_free (self->menu_box_pattern);
+      self->menu_box_pattern = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "item_pixmap_style") == 0)
+    {
+      self->need_to_recreate_boxes = 1;
+      grub_free (self->item_box_pattern);
+      self->item_box_pattern = value ? grub_strdup (value) : 0;
+      if (self->selected_item_box_pattern_inherit)
+        {
+          grub_free (self->selected_item_box_pattern);
+          self->selected_item_box_pattern = value ? grub_strdup (value) : 0;
+        }
+    }
+  else if (grub_strcmp (name, "selected_item_pixmap_style") == 0)
+    {
+      if (!value || grub_strcmp (value, "inherit") == 0)
+        {
+          grub_free (self->selected_item_box_pattern);
+          char *tmp = self->item_box_pattern;
+          self->selected_item_box_pattern = tmp ? grub_strdup (tmp) : 0;
+          self->selected_item_box_pattern_inherit = 1;
+        }
+      else
+        {
+          self->need_to_recreate_boxes = 1;
+          grub_free (self->selected_item_box_pattern);
+          self->selected_item_box_pattern = value ? grub_strdup (value) : 0;
+          self->selected_item_box_pattern_inherit = 0;
+        }
+    }
+  else if (grub_strcmp (name, "scrollbar_frame") == 0)
+    {
+      self->need_to_recreate_scrollbar = 1;
+      grub_free (self->scrollbar_frame_pattern);
+      self->scrollbar_frame_pattern = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "scrollbar_thumb") == 0)
+    {
+      self->need_to_recreate_scrollbar = 1;
+      grub_free (self->scrollbar_thumb_pattern);
+      self->scrollbar_thumb_pattern = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "scrollbar_thumb_overlay") == 0)
+    {
+      self->scrollbar_thumb_overlay = grub_strcmp (value, "true") == 0;
+    }
+  else if (grub_strcmp (name, "scrollbar_width") == 0)
+    {
+      self->scrollbar_width = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "scrollbar_slice") == 0)
+    {
+      if (grub_strcmp (value, "west") == 0)
+        self->scrollbar_slice = SCROLLBAR_SLICE_WEST;
+      else if (grub_strcmp (value, "center") == 0)
+        self->scrollbar_slice = SCROLLBAR_SLICE_CENTER;
+      else if (grub_strcmp (value, "east") == 0)
+        self->scrollbar_slice = SCROLLBAR_SLICE_EAST;
+    }
+  else if (grub_strcmp (name, "scrollbar_left_pad") == 0)
+    {
+      self->scrollbar_left_pad = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "scrollbar_right_pad") == 0)
+    {
+      self->scrollbar_right_pad = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "scrollbar_top_pad") == 0)
+    {
+      self->scrollbar_top_pad = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "scrollbar_bottom_pad") == 0)
+    {
+      self->scrollbar_bottom_pad = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "scrollbar") == 0)
+    {
+      self->draw_scrollbar = grub_strcmp (value, "false") != 0;
+    }
+  else if (grub_strcmp (name, "theme_dir") == 0)
+    {
+      self->need_to_recreate_boxes = 1;
+      grub_free (self->theme_dir);
+      self->theme_dir = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "id") == 0)
+    {
+      grub_free (self->id);
+      if (value)
+        self->id = grub_strdup (value);
+      else
+        self->id = 0;
+    }
+  return grub_errno;
+}
+
+/* Set necessary information that the gfxmenu view provides.  */
+static void
+list_set_view_info (void *vself,
+                    grub_gfxmenu_view_t view)
+{
+  list_impl_t self = vself;
+  grub_gfxmenu_icon_manager_set_theme_path (self->icon_manager,
+					    view->theme_path);
+  self->view = view;
+}
+
+/* Refresh list variables */
+static void
+list_refresh_info (void *vself,
+                   grub_gfxmenu_view_t view)
+{
+  list_impl_t self = vself;
+  if (view->nested)
+    self->first_shown_index = 0;
+}
+
+static struct grub_gui_component_ops list_comp_ops =
+  {
+    .destroy = list_destroy,
+    .get_id = list_get_id,
+    .is_instance = list_is_instance,
+    .paint = list_paint,
+    .set_parent = list_set_parent,
+    .get_parent = list_get_parent,
+    .set_bounds = list_set_bounds,
+    .get_bounds = list_get_bounds,
+    .get_minimal_size = list_get_minimal_size,
+    .set_property = list_set_property
+  };
+
+static struct grub_gui_list_ops list_ops =
+{
+  .set_view_info = list_set_view_info,
+  .refresh_list = list_refresh_info
+};
+
+grub_gui_component_t
+grub_gui_list_new (void)
+{
+  list_impl_t self;
+  grub_font_t default_font;
+  grub_video_rgba_color_t default_fg_color;
+
+  self = grub_zalloc (sizeof (*self));
+  if (! self)
+    return 0;
+
+  self->list.ops = &list_ops;
+  self->list.component.ops = &list_comp_ops;
+
+  self->visible = 1;
+
+  default_font = grub_font_get ("Unknown Regular 16");
+  default_fg_color = grub_video_rgba_color_rgb (0, 0, 0);
+
+  self->icon_width = 32;
+  self->icon_height = 32;
+  self->item_height = 42;
+  self->item_padding = 14;
+  self->item_icon_space = 4;
+  self->item_spacing = 16;
+  self->item_font = default_font;
+  self->selected_item_font_inherit = 1; /* Default to using the item_font.  */
+  self->selected_item_font = default_font;
+  self->item_color = default_fg_color;
+  self->selected_item_color_inherit = 1;  /* Default to using the item_color.  */
+  self->selected_item_color = default_fg_color;
+
+  self->draw_scrollbar = 1;
+  self->need_to_recreate_scrollbar = 1;
+  self->scrollbar_frame = 0;
+  self->scrollbar_thumb = 0;
+  self->scrollbar_frame_pattern = 0;
+  self->scrollbar_thumb_pattern = 0;
+  self->scrollbar_thumb_overlay = 0;
+  self->scrollbar_width = 16;
+  self->scrollbar_slice = SCROLLBAR_SLICE_EAST;
+  self->scrollbar_left_pad = 2;
+  self->scrollbar_right_pad = 0;
+  self->scrollbar_top_pad = 0;
+  self->scrollbar_bottom_pad = 0;
+
+  self->first_shown_index = 0;
+
+  self->need_to_recreate_boxes = 0;
+  self->theme_dir = 0;
+  self->menu_box_pattern = 0;
+  self->item_box_pattern = 0;
+  self->selected_item_box_pattern_inherit = 1;/*Default to using the item_box.*/
+  self->selected_item_box_pattern = 0;
+  self->menu_box = grub_gfxmenu_create_box (0, 0);
+  self->item_box = grub_gfxmenu_create_box (0, 0);
+  self->selected_item_box = grub_gfxmenu_create_box (0, 0);
+
+  self->icon_manager = grub_gfxmenu_icon_manager_new ();
+  if (! self->icon_manager)
+    {
+      self->list.component.ops->destroy (self);
+      return 0;
+    }
+  grub_gfxmenu_icon_manager_set_icon_size (self->icon_manager,
+                                           self->icon_width,
+                                           self->icon_height);
+  return (grub_gui_component_t) self;
+}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/theme_loader.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/theme_loader.c
@@ -163,6 +163,12 @@ theme_set_string (grub_gfxmenu_view_t view,
    grub_video_parse_color (value, &view->message_color);
  else if (! grub_strcmp ("message-bg-color", name))
    grub_video_parse_color (value, &view->message_bg_color);
+  else if (! grub_strcmp("menu-tip-left", name))
+    grub_env_set("VTOY_TIP_LEFT", value);
+  else if (! grub_strcmp("menu-tip-top", name))
+    grub_env_set("VTOY_TIP_TOP", value);
+  else if (! grub_strcmp("menu-tip-color", name))
+    grub_env_set("VTOY_TIP_COLOR", value);
  else if (! grub_strcmp ("desktop-image", name))
    {
      struct grub_video_bitmap *raw_bitmap;
@@ -450,7 +456,8 @@ read_expression (struct parsebuf *p)
      /* Read as a single word -- for numeric values or words without
         whitespace.  */
      start = p->pos;
-      while (has_more (p) && ! is_whitespace (peek_char (p)))
+      while (has_more (p) && ! is_whitespace (peek_char (p))
+             && peek_char (p) != '}')
        read_char (p);
      end = p->pos;
    }
@@ -740,6 +747,7 @@ extern int g_menu_update_mode;
 grub_err_t
 grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view, const char *theme_path)
 {
+  int flag = 0;
  grub_file_t file;
  struct parsebuf p;

@@ -783,32 +791,7 @@ grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view, const char *theme_path)
  }
 }

-{
-    const char *tip = grub_env_get("VTOY_MENU_TIP_ENABLE");
-    if (tip && tip[0] == '1')
-    {
-        char tmpmsg[512];

-        grub_memset(tmpmsg, 'w', 500);
-        tmpmsg[500] = 0;
-        
-        g_menu_update_mode = 1;
-        p.len += grub_snprintf(p.buf + p.len, 4096, 
-            "\n+ vbox{\n    left = %s\n    top = %s\n"
-            "+ label { id=\"VTOY_MENU_TIP_1\" text = \"%s\" color = \"%s\" align = \"%s\"}\n"
-            "+ label { id=\"VTOY_MENU_TIP_2\" text = \"%s\" color = \"%s\" align = \"%s\"}\n"
-            "}\n",
-            grub_env_get("VTOY_TIP_LEFT"),
-            grub_env_get("VTOY_TIP_TOP"),
-            tmpmsg,
-            grub_env_get("VTOY_TIP_COLOR"),
-            grub_env_get("VTOY_TIP_ALIGN"),
-            tmpmsg,
-            grub_env_get("VTOY_TIP_COLOR"),
-            grub_env_get("VTOY_TIP_ALIGN")
-        );
-    }
-}

  if (view->canvas)
    view->canvas->component.ops->destroy (view->canvas);
@@ -820,6 +803,7 @@ grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view, const char *theme_path)
    ->ops->set_bounds ((grub_gui_component_t) view->canvas,
                       &view->screen);

+parse:    
  while (has_more (&p))
    {
      /* Skip comments (lines beginning with #).  */
@@ -848,6 +832,40 @@ grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view, const char *theme_path)
        goto fail;
    }

+
+if (flag == 0)
+{
+    const char *tip = grub_env_get("VTOY_MENU_TIP_ENABLE");
+    if (tip && tip[0] == '1')
+    {
+        char tmpmsg[512];
+
+        grub_memset(tmpmsg, 'w', 500);
+        tmpmsg[500] = 0;
+        
+        g_menu_update_mode = 1;
+        p.len += grub_snprintf(p.buf + p.len, 4096, 
+            "\n+ vbox{\n    left = %s\n    top = %s\n"
+            "+ label { id=\"VTOY_MENU_TIP_1\" text = \"%s\" color = \"%s\" align = \"%s\"}\n"
+            "+ label { id=\"VTOY_MENU_TIP_2\" text = \"%s\" color = \"%s\" align = \"%s\"}\n"
+            "}\n",
+            grub_env_get("VTOY_TIP_LEFT"),
+            grub_env_get("VTOY_TIP_TOP"),
+            tmpmsg,
+            grub_env_get("VTOY_TIP_COLOR"),
+            grub_env_get("VTOY_TIP_ALIGN"),
+            tmpmsg,
+            grub_env_get("VTOY_TIP_COLOR"),
+            grub_env_get("VTOY_TIP_ALIGN")
+        );
+
+        flag = 1;
+        goto parse;
+    }
+}
+
+
+
  /* Set the new theme path.  */
  grub_free (view->theme_path);
  view->theme_path = grub_strdup (theme_path);
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/view.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/view.c
@@ -37,6 +37,7 @@
 #include <grub/gui_string_util.h>
 #include <grub/icon_manager.h>
 #include <grub/i18n.h>
+#include <grub/charset.h>

 static void
 init_terminal (grub_gfxmenu_view_t view);
@@ -142,6 +143,8 @@ grub_gfxmenu_view_destroy (grub_gfxmenu_view_t view)
  grub_free (view->title_text);
  grub_free (view->progress_message_text);
  grub_free (view->theme_path);
+  if (view->menu_title_offset)
+    grub_free (view->menu_title_offset);
  if (view->canvas)
    view->canvas->component.ops->destroy (view->canvas);
  grub_free (view);
@@ -428,6 +431,32 @@ grub_gfxmenu_set_chosen_entry (int entry, void *data)
  
 }

+void
+grub_gfxmenu_scroll_chosen_entry (void *data, int diren)
+{
+  grub_gfxmenu_view_t view = data;
+  const char *item_title;
+  int off;
+  int max;
+
+  if (!view->menu->size)
+    return;
+
+  item_title = grub_menu_get_entry (view->menu, view->selected)->title;
+  off = view->menu_title_offset[view->selected] + diren;
+  max = grub_utf8_get_num_code (item_title, grub_strlen(item_title));
+
+  if (diren == 1000000)
+    off = (max >= 20) ? (max - 20) : 0;
+  else if (off < 0)
+    off = 0;
+  else if (off > max)
+    off = max;
+
+  view->menu_title_offset[view->selected] = off;
+  grub_gfxmenu_redraw_menu (view);
+}
+
 static void
 grub_gfxmenu_draw_terminal_box (void)
 {
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/disk.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/disk.c
@@ -471,7 +471,7 @@ grub_err_t
 grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
 		grub_off_t offset, grub_size_t size, void *buf)
 {
-    if (disk->read_hook == (grub_disk_read_hook_t)grub_disk_blocklist_read)
+    if (disk->read_hook == (grub_disk_read_hook_t)(void *)grub_disk_blocklist_read)
    {
        return grub_disk_blocklist_read((ventoy_img_chunk_list *)disk->read_hook_data, sector, size, disk->log_sector_size);
    }
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/efi/mm.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/efi/mm.c
@@ -49,6 +49,12 @@ static grub_efi_uintn_t finish_desc_size;
 static grub_efi_uint32_t finish_desc_version;
 int grub_efi_is_finished = 0;

+/* 160MB  160 * 1024 * 1024 / 4096 */
+#define VTOY_CHAIN_MIN_PAGES   (160 * 256)
+static grub_efi_uint64_t g_total_pages;
+static grub_efi_uint64_t g_org_required_pages;
+static grub_efi_uint64_t g_new_required_pages;
+
 /*
 * We need to roll back EFI allocations on exit. Remember allocations that
 * we'll free on exit.
@@ -614,6 +620,22 @@ grub_efi_mm_init (void)
  else if (required_pages > BYTES_TO_PAGES (MAX_HEAP_SIZE))
    required_pages = BYTES_TO_PAGES (MAX_HEAP_SIZE);

+  g_org_required_pages = required_pages;
+  if (((total_pages - required_pages) >> 2) < VTOY_CHAIN_MIN_PAGES)
+  {
+      if (total_pages > (VTOY_CHAIN_MIN_PAGES << 2))
+      {
+          g_new_required_pages = total_pages - (VTOY_CHAIN_MIN_PAGES << 2);
+          if (g_new_required_pages >= 8192)
+          {
+              required_pages = g_new_required_pages;
+          }          
+      }
+  }
+
+  g_total_pages = total_pages;
+  g_new_required_pages = required_pages;
+
  /* Sort the filtered descriptors, so that GRUB can allocate pages
     from smaller regions.  */
  sort_memory_map (filtered_memory_map, desc_size, filtered_memory_map_end);
@@ -670,3 +692,11 @@ grub_efi_get_ram_base(grub_addr_t *base_addr)
  return GRUB_ERR_NONE;
 }
 #endif
+
+void grub_efi_get_reserved_page_num(grub_uint64_t *total, grub_uint64_t *org_required, grub_uint64_t *new_required)
+{
+    *total = g_total_pages;
+    *org_required = g_org_required_pages;
+    *new_required = g_new_required_pages;
+}
+
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/charset.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/charset.c
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu.c
@@ -461,6 +461,15 @@ menu_set_chosen_entry (grub_menu_t menu, int entry)
    cur->set_chosen_entry (entry, cur->data);
 }

+static void
+menu_scroll_chosen_entry (int diren)
+{
+  struct grub_menu_viewer *cur;
+  for (cur = viewers; cur; cur = cur->next)
+    if (cur->scroll_chosen_entry)
+      cur->scroll_chosen_entry (cur->data, diren);
+}
+
 static void
 menu_print_timeout (int timeout)
 {
@@ -846,6 +855,19 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 	      menu_set_chosen_entry (menu, current_entry);
 	      break;

+	    case GRUB_TERM_KEY_RIGHT:
+	      menu_scroll_chosen_entry (1);
+	      break;
+	    case GRUB_TERM_KEY_LEFT:
+	      menu_scroll_chosen_entry (-1);
+	      break;
+	    case GRUB_TERM_CTRL | GRUB_TERM_KEY_RIGHT:
+	      menu_scroll_chosen_entry (1000000);
+	      break;
+	    case GRUB_TERM_CTRL | GRUB_TERM_KEY_LEFT:
+	      menu_scroll_chosen_entry (-1000000);
+	      break;
+
 	    case '\n':
 	    case '\r':
 	//    case GRUB_TERM_KEY_RIGHT:
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu_text.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu_text.c
@@ -42,6 +42,7 @@ struct menu_viewer_data
    TIMEOUT_TERSE_NO_MARGIN
  } timeout_msg;
  grub_menu_t menu;
+  int *menu_title_offset;
  struct grub_term_output *term;
 };

@@ -524,6 +525,37 @@ menu_text_set_chosen_entry (int entry, void *dataptr)
  grub_term_refresh (data->term);
 }

+static void
+menu_text_scroll_chosen_entry (void *dataptr, int diren)
+{
+  struct menu_viewer_data *data = dataptr;
+  const char *orig_title, *scrolled_title;
+  int off;
+  int selected;
+  grub_menu_entry_t entry;
+
+  if (!data->menu->size)
+    return;
+
+  selected = data->first + data->offset;
+  entry = grub_menu_get_entry (data->menu, selected);
+  orig_title = entry->title;
+  off = data->menu_title_offset[selected] + diren;
+  if (off < 0
+      || off > grub_utf8_get_num_code (orig_title, grub_strlen(orig_title)))
+    return;
+
+  scrolled_title =
+    grub_utf8_offset_code (orig_title, grub_strlen (orig_title), off);
+  if (scrolled_title)
+    entry->title = scrolled_title;
+  print_entry (data->geo.first_entry_y + data->offset, 1, entry, data);
+
+  entry->title = orig_title;
+  data->menu_title_offset[selected] = off;
+  grub_term_refresh (data->term);
+}
+
 static void
 menu_text_fini (void *dataptr)
 {
@@ -531,6 +563,8 @@ menu_text_fini (void *dataptr)

  grub_term_setcursor (data->term, 1);
  grub_term_cls (data->term);
+  if (data->menu_title_offset)
+    grub_free (data->menu_title_offset);
  grub_free (data);
 }

@@ -585,9 +619,14 @@ grub_menu_try_text (struct grub_term_output *term,
      return grub_errno;
    }

+  if (menu->size)
+    data->menu_title_offset = grub_zalloc (sizeof (*data->menu_title_offset) * menu->size);
+
  data->term = term;
  instance->data = data;
  instance->set_chosen_entry = menu_text_set_chosen_entry;
+  if (data->menu_title_offset)
+    instance->scroll_chosen_entry = menu_text_scroll_chosen_entry;
  instance->print_timeout = menu_text_print_timeout;
  instance->clear_timeout = menu_text_clear_timeout;
  instance->fini = menu_text_fini;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/term/efi/mouse.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/term/efi/mouse.c
@@ -0,0 +1,260 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2022  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/dl.h>
+#include <grub/term.h>
+#include <grub/misc.h>
+#include <grub/types.h>
+#include <grub/command.h>
+#include <grub/i18n.h>
+#include <grub/err.h>
+#include <grub/env.h>
+#include <grub/efi/efi.h>
+#include <grub/efi/api.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+#define GRUB_EFI_SIMPLE_POINTER_GUID  \
+  { 0x31878c87, 0x0b75, 0x11d5, \
+    { 0x9a, 0x4f, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
+  }
+
+typedef struct
+{
+  grub_efi_int32_t x;
+  grub_efi_int32_t y;
+  grub_efi_int32_t z;
+  grub_efi_boolean_t left;
+  grub_efi_boolean_t right;
+} grub_efi_mouse_state;
+
+grub_efi_mouse_state no_move = {0, 0, 0, 0, 0};
+
+typedef struct
+{
+  grub_efi_uint64_t x;
+  grub_efi_uint64_t y;
+  grub_efi_uint64_t z;
+  grub_efi_boolean_t left;
+  grub_efi_boolean_t right;
+} grub_efi_mouse_mode;
+
+struct grub_efi_simple_pointer_protocol
+{
+  grub_efi_status_t (*reset) (struct grub_efi_simple_pointer_protocol *this,
+                              grub_efi_boolean_t extended_verification);
+  grub_efi_status_t (*get_state) (struct grub_efi_simple_pointer_protocol *this,
+                                  grub_efi_mouse_state *state);
+  grub_efi_event_t *wait_for_input;
+  grub_efi_mouse_mode *mode;
+};
+typedef struct grub_efi_simple_pointer_protocol grub_efi_simple_pointer_protocol_t;
+
+typedef struct
+{
+  grub_efi_uintn_t count;
+  grub_efi_simple_pointer_protocol_t **mouse;
+} grub_efi_mouse_prot_t;
+
+static grub_int32_t
+mouse_div (grub_int32_t a, grub_uint64_t b)
+{
+  grub_int32_t s = 1, q, ret;
+  grub_uint64_t n = a;
+  if (!b)
+    return 0;
+  if (a < 0)
+  {
+    s = -1;
+    n = -a;
+  }
+  q = grub_divmod64 (n, b, NULL);
+  ret = s * (q > 0 ? q : -q);
+  return ret;
+}
+
+static grub_efi_mouse_prot_t *
+grub_efi_mouse_prot_init (void)
+{
+  grub_efi_status_t status;
+  grub_efi_guid_t mouse_guid = GRUB_EFI_SIMPLE_POINTER_GUID;
+  grub_efi_mouse_prot_t *mouse_input = NULL;
+  grub_efi_boot_services_t *b = grub_efi_system_table->boot_services;
+  grub_efi_handle_t *buf;
+  grub_efi_uintn_t count;
+  grub_efi_uintn_t i;
+
+  status = efi_call_5 (b->locate_handle_buffer, GRUB_EFI_BY_PROTOCOL,
+                       &mouse_guid, NULL, &count, &buf);
+  if (status != GRUB_EFI_SUCCESS)
+  {
+#ifdef MOUSE_DEBUG
+    grub_printf ("ERROR: SimplePointerProtocol not found.\n");
+#endif
+    return NULL;
+  }
+
+  mouse_input = grub_malloc (sizeof (grub_efi_mouse_prot_t));
+  if (!mouse_input)
+    goto end;
+  mouse_input->mouse = grub_malloc (count
+            * sizeof (grub_efi_simple_pointer_protocol_t *));
+  if (!mouse_input->mouse)
+  {
+    grub_free (mouse_input);
+    mouse_input = NULL;
+    goto end;
+  }
+  mouse_input->count = count;
+  for (i = 0; i < count; i++)
+  {
+    efi_call_3 (b->handle_protocol,
+                buf[i], &mouse_guid, (void **)&mouse_input->mouse[i]);
+#ifdef MOUSE_DEBUG
+    grub_printf ("%d %p ", (int)i, mouse_input->mouse[i]);
+#endif
+    efi_call_2 (mouse_input->mouse[i]->reset, mouse_input->mouse[i], 1);
+#ifdef MOUSE_DEBUG
+    grub_printf
+      ("[%"PRIuGRUB_UINT64_T"] [%"PRIuGRUB_UINT64_T"] [%"PRIuGRUB_UINT64_T"]\n",
+       mouse_input->mouse[i]->mode->x,
+       mouse_input->mouse[i]->mode->y, mouse_input->mouse[i]->mode->z);
+#endif
+  }
+  
+end:  
+  efi_call_1(b->free_pool, buf);
+
+  return mouse_input;
+}
+
+static grub_err_t
+grub_efi_mouse_input_init (struct grub_term_input *term)
+{
+  grub_efi_mouse_prot_t *mouse_input = NULL;
+  if (term->data)
+    return 0;
+  mouse_input = grub_efi_mouse_prot_init ();
+  if (!mouse_input)
+    return GRUB_ERR_BAD_OS;
+
+  term->data = (void *)mouse_input;
+
+  return 0;
+}
+
+static int
+grub_mouse_getkey (struct grub_term_input *term)
+{
+  grub_efi_mouse_state cur;
+  grub_efi_mouse_prot_t *mouse = term->data;
+  //int x;
+  int y;
+  int delta = 0;
+  const char *env;
+  grub_efi_uintn_t i;
+  if (!mouse)
+    return GRUB_TERM_NO_KEY;
+
+  env = grub_env_get("mouse_delta");
+  if (env)
+    delta = (int)grub_strtol(env, NULL, 10);
+  
+  for (i = 0; i < mouse->count; i++)
+  {
+    efi_call_2 (mouse->mouse[i]->get_state, mouse->mouse[i], &cur);
+    if (grub_memcmp (&cur, &no_move, sizeof (grub_efi_mouse_state)) != 0)
+    {
+      y = mouse_div (cur.y, mouse->mouse[i]->mode->y);
+      if (cur.left)
+        return 0x0d;
+      if (cur.right)
+        return GRUB_TERM_ESC;
+      if (y > delta)
+        return GRUB_TERM_KEY_DOWN;
+      if (y < -delta)
+        return GRUB_TERM_KEY_UP;
+    }
+  }
+  return GRUB_TERM_NO_KEY;
+}
+
+#ifdef MOUSE_DEBUG
+static grub_err_t
+grub_cmd_mouse_test (grub_command_t cmd __attribute__ ((unused)),
+                    int argc __attribute__ ((unused)),
+                    char **args __attribute__ ((unused)))
+
+{
+  grub_efi_mouse_state cur;
+  int x = 0, y = 0, z = 0;
+  grub_efi_uintn_t i;
+  grub_efi_mouse_prot_t *mouse = NULL;
+
+  mouse = grub_efi_mouse_prot_init ();
+  if (!mouse)
+    return grub_error (GRUB_ERR_BAD_OS, "mouse not found.\n");
+  grub_printf ("Press [1] to exit.\n");
+  while (1)
+  {
+    if (grub_getkey_noblock () == '1')
+      break;
+    for (i = 0; i < mouse->count; i++)
+    {
+      efi_call_2 (mouse->mouse[i]->get_state, mouse->mouse[i], &cur);
+      if (grub_memcmp (&cur, &no_move, sizeof (grub_efi_mouse_state)) != 0)
+      {
+        x = mouse_div (cur.x, mouse->mouse[i]->mode->x);
+        y = mouse_div (cur.y, mouse->mouse[i]->mode->y);
+        z = mouse_div (cur.z, mouse->mouse[i]->mode->z);
+        grub_printf ("[ID=%d] X=%d Y=%d Z=%d L=%d R=%d\n",
+                     (int)i, x, y, z, cur.left, cur.right);
+      }
+    }
+    grub_refresh ();
+  }
+  grub_free (mouse->mouse);
+  grub_free (mouse);
+  return GRUB_ERR_NONE;
+}
+static grub_command_t cmd;
+#endif
+
+static struct grub_term_input grub_mouse_term_input =
+{
+  .name = "mouse",
+  .getkey = grub_mouse_getkey,
+  .init = grub_efi_mouse_input_init,
+};
+
+GRUB_MOD_INIT(mouse)
+{
+  grub_term_register_input ("mouse", &grub_mouse_term_input);
+#ifdef MOUSE_DEBUG
+  cmd = grub_register_command ("mouse_test", grub_cmd_mouse_test, 0,
+                               N_("UEFI mouse test."));
+#endif
+}
+
+GRUB_MOD_FINI(mouse)
+{
+  grub_term_unregister_input (&grub_mouse_term_input);
+#ifdef MOUSE_DEBUG
+  grub_unregister_command (cmd);
+#endif
+}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c
@@ -35,6 +35,10 @@
 #include <grub/misc.h>
 #include <grub/kernel.h>
 #include <grub/time.h>
+#include <grub/memory.h>
+#ifdef GRUB_MACHINE_EFI
+#include <grub/efi/efi.h>
+#endif
 #include <grub/ventoy.h>
 #include "ventoy_def.h"

@@ -162,8 +166,52 @@ static int ventoy_arch_mode_init(void)
    return 0;
 }

+#ifdef GRUB_MACHINE_EFI
+static void ventoy_get_uefi_version(char *str, grub_size_t len)
+{
+    grub_efi_uint8_t uefi_minor_1, uefi_minor_2;
+
+    uefi_minor_1 = (grub_efi_system_table->hdr.revision & 0xffff) / 10;
+    uefi_minor_2 = (grub_efi_system_table->hdr.revision & 0xffff) % 10;
+    grub_snprintf(str, len, "%d.%d", (grub_efi_system_table->hdr.revision >> 16), uefi_minor_1);
+    if (uefi_minor_2)
+        grub_snprintf(str, len, "%s.%d", str, uefi_minor_2);
+}
+#endif
+
+static int ventoy_calc_totalmem(grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type, void *data)
+{
+    grub_uint64_t *total_mem = (grub_uint64_t *)data;
+
+    (void)addr;
+    (void)type;
+
+    *total_mem += size;
+
+    return 0;
+}
+
+static int ventoy_hwinfo_init(void)
+{
+    char str[256];
+    grub_uint64_t total_mem = 0;
+
+    grub_machine_mmap_iterate(ventoy_calc_totalmem, &total_mem);
+
+    grub_snprintf(str, sizeof(str), "%ld", (long)(total_mem / VTOY_SIZE_1MB));
+    ventoy_env_export("grub_total_ram", str);
+    
+#ifdef GRUB_MACHINE_EFI
+    ventoy_get_uefi_version(str, sizeof(str));
+    ventoy_env_export("grub_uefi_version", str);
+#endif
+    
+    return 0;
+}
+
 GRUB_MOD_INIT(ventoy)
 {
+    ventoy_hwinfo_init();
    ventoy_env_init();
    ventoy_arch_mode_init();
    ventoy_register_all_cmd();
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_browser.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_browser.c
@@ -520,13 +520,13 @@ grub_err_t ventoy_cmd_browser_dir(grub_extcmd_context_t ctxt, int argc, char **a

    if (g_tree_view_menu_style == 0)
    {
-        browser_ssprintf(&mbuf, "menuentry \"%-10s [../]\" --class=\"vtoyret\" VTOY_RET {\n  "
-                         "  echo 'return ...' \n}\n", "<--");        
+        browser_ssprintf(&mbuf, "menuentry \"%-10s [(%s)%s/..]\" --class=\"vtoyret\" VTOY_RET {\n  "
+                         "  echo 'return ...' \n}\n", "<--", args[0], g_menu_path_buf);        
    }
    else
    {
-        browser_ssprintf(&mbuf, "menuentry \"[../]\" --class=\"vtoyret\" VTOY_RET {\n  "
-                         "  echo 'return ...' \n}\n");        
+        browser_ssprintf(&mbuf, "menuentry \"[(%s)%s/..]\" --class=\"vtoyret\" VTOY_RET {\n  "
+                         "  echo 'return ...' \n}\n", args[0], g_menu_path_buf);        
    }

    for (i = 1; i >= 0; i--)
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
@@ -113,6 +113,7 @@ grub_uint8_t *g_conf_replace_new_buf = NULL;
 int g_conf_replace_new_len = 0;
 int g_conf_replace_new_len_align = 0;

+int g_ventoy_disk_bios_id = 0;
 ventoy_gpt_info *g_ventoy_part_info = NULL;
 grub_uint64_t g_ventoy_disk_size = 0;
 grub_uint64_t g_ventoy_disk_part_size[2];
@@ -2295,8 +2296,8 @@ static int ventoy_dynamic_tree_menu(img_iterator_node *node)
            {
                vtoy_ssprintf(g_tree_script_buf, g_tree_script_pos, 
                              "menuentry \"[Return to ListView]\" --class=\"vtoyret\" VTOY_RET {\n  "
-                              "  echo '%s ...' \n"
-                              "}\n", "return");
+                              "  echo 'return ...' \n"
+                              "}\n");
            }
        }

@@ -2350,16 +2351,16 @@ static int ventoy_dynamic_tree_menu(img_iterator_node *node)
        if (g_tree_view_menu_style == 0)
        {
            vtoy_ssprintf(g_tree_script_buf, g_tree_script_pos, 
-                          "menuentry \"%-10s [../]\" --class=\"vtoyret\" VTOY_RET {\n  "
+                          "menuentry \"%-10s [%s/..]\" --class=\"vtoyret\" VTOY_RET {\n  "
                          "  echo 'return ...' \n"
-                          "}\n", "<--");
+                          "}\n", "<--", node->dir);
        }
        else
        {
            vtoy_ssprintf(g_tree_script_buf, g_tree_script_pos, 
-                          "menuentry \"[../]\" --class=\"vtoyret\" VTOY_RET {\n  "
-                          "  echo '%s ...' \n"
-                          "}\n", "return");
+                          "menuentry \"[%s/..]\" --class=\"vtoyret\" VTOY_RET {\n  "
+                          "  echo 'return ...' \n"
+                          "}\n", node->dir);
        }
    }

@@ -2397,7 +2398,7 @@ static int ventoy_dynamic_tree_menu(img_iterator_node *node)

    if (node != &g_img_iterator_head)
    {
-        vtoy_ssprintf(g_tree_script_buf, g_tree_script_pos, "%s", "}\n");
+        vtoy_ssprintf(g_tree_script_buf, g_tree_script_pos, "}\n");
    }

    node->done = 1;
@@ -2611,25 +2612,39 @@ static grub_err_t ventoy_cmd_chosen_img_path(grub_extcmd_context_t ctxt, int arg
 {
    char value[32];
    char *pos = NULL;
+    char *last = NULL;
    const char *id = NULL;
    img_info *cur = NULL;

    (void)ctxt;
    
-    if (argc < 1 || argc > 2)
+    if (argc < 1 || argc > 3)
    {
        return grub_error(GRUB_ERR_BAD_ARGUMENT, "Usage: %s {var}", cmd_raw_name);
    }

    if (g_fake_vlnk_src[0] && g_fake_vlnk_dst[0])
    {
-        grub_env_set(args[0], grub_strchr(g_fake_vlnk_src, '/'));
+        pos = grub_strchr(g_fake_vlnk_src, '/');
+        grub_env_set(args[0], pos);
        if (argc > 1)
        {
            grub_snprintf(value, sizeof(value), "%llu", (ulonglong)(g_fake_vlnk_size));
            grub_env_set(args[1], value);        
        }
        
+        if (argc > 2)
+        {
+            for (last = pos; *pos; pos++)
+            {
+                if (*pos == '/')
+                {
+                    last = pos;
+                }
+            }
+            grub_env_set(args[2], last + 1);
+        }
+
        goto end;
    }

@@ -2658,6 +2673,12 @@ static grub_err_t ventoy_cmd_chosen_img_path(grub_extcmd_context_t ctxt, int arg
        grub_env_set(args[1], value);        
    }
    
+    if (argc > 2)
+    {
+        grub_snprintf(value, sizeof(value), "%llu", (ulonglong)(cur->size));
+        grub_env_set(args[2], cur->name);
+    }
+
 end:
    g_svd_replace_offset = 0;

@@ -3152,7 +3173,7 @@ int ventoy_get_block_list(grub_file_t file, ventoy_img_chunk_list *chunklist, gr
    }
    else
    {
-        file->read_hook = (grub_disk_read_hook_t)grub_disk_blocklist_read;
+        file->read_hook = (grub_disk_read_hook_t)(void *)grub_disk_blocklist_read;
        file->read_hook_data = chunklist;

        for (size = file->size; size > 0; size -= read)
@@ -4526,6 +4547,8 @@ int ventoy_load_part_table(const char *diskname)

    g_ventoy_disk_size = disk->total_sectors * (1U << disk->log_sector_size);

+    g_ventoy_disk_bios_id = disk->id;
+
    grub_disk_read(disk, 0, 0, sizeof(ventoy_gpt_info), g_ventoy_part_info);
    grub_disk_close(disk);

@@ -5565,6 +5588,33 @@ static grub_err_t ventoy_cmd_fn_mutex_lock(grub_extcmd_context_t ctxt, int argc,
    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }

+static grub_err_t ventoy_cmd_dump_rsv_page(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    grub_uint64_t total;
+    grub_uint64_t org_required;
+    grub_uint64_t new_required;
+    
+    (void)ctxt;
+    (void)argc;
+    (void)args;
+
+#ifdef GRUB_MACHINE_EFI
+    grub_efi_get_reserved_page_num(&total, &org_required, &new_required);
+    grub_printf("Total pages: %llu\n", (unsigned long long)total);
+    grub_printf("OrgReq pages: %llu\n", (unsigned long long)org_required);
+    grub_printf("NewReq pages: %llu\n", (unsigned long long)new_required);
+#else
+    (void)total;
+    (void)org_required;
+    (void)new_required;
+    grub_printf("Non EFI mode!\n");
+#endif
+
+    grub_refresh();
+
+    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
+}
+
 int ventoy_env_init(void)
 {
    char buf[64];
@@ -5766,6 +5816,7 @@ static cmd_para ventoy_cmds[] =
    { "vt_iso_vd_id_clear", ventoy_iso_vd_id_clear, 0, NULL, "", "", NULL },
    { "vt_iso_vd_id_begin", ventoy_cmd_iso_vd_id_begin, 0, NULL, "", "", NULL },
    { "vt_fn_mutex_lock", ventoy_cmd_fn_mutex_lock, 0, NULL, "", "", NULL },
+    { "vt_efi_dump_rsv_page", ventoy_cmd_dump_rsv_page, 0, NULL, "", "", NULL },
 };

 int ventoy_register_all_cmd(void)
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
@@ -313,8 +313,8 @@ extern int g_ventoy_debug;
 void ventoy_debug(const char *fmt, ...);
 #define debug(fmt, args...) if (g_ventoy_debug) ventoy_debug("[VTOY]: "fmt, ##args)

-#define vtoy_ssprintf(buf, pos, fmt, ...) \
-    pos += grub_snprintf(buf + pos, VTOY_MAX_SCRIPT_BUF - pos, fmt, __VA_ARGS__)
+#define vtoy_ssprintf(buf, pos, fmt, args...) \
+    pos += grub_snprintf(buf + pos, VTOY_MAX_SCRIPT_BUF - pos, fmt, ##args)

 #define browser_ssprintf(mbuf, fmt, args...) \
    (mbuf)->pos += grub_snprintf((mbuf)->buf + (mbuf)->pos, (mbuf)->max - (mbuf)->pos, fmt, ##args)
@@ -1034,6 +1034,7 @@ extern conf_replace *g_conf_replace_node;
 extern grub_uint8_t *g_conf_replace_new_buf;
 extern int g_conf_replace_new_len;
 extern int g_conf_replace_new_len_align;
+extern int g_ventoy_disk_bios_id;
 extern grub_uint64_t g_ventoy_disk_size;
 extern grub_uint64_t g_ventoy_disk_part_size[2];
 extern grub_uint32_t g_ventoy_plat_data;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_windows.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_windows.c
@@ -1651,25 +1651,40 @@ static void ventoy_windows_fill_virt_data(    grub_uint64_t isosize, ventoy_chai
    return;
 }

-static int ventoy_windows_drive_map(ventoy_chain_head *chain)
+static int ventoy_windows_drive_map(ventoy_chain_head *chain, int vlnk)
 {
+    int hd1 = 0;
    grub_disk_t disk;
        
-    debug("drive map begin <%p> ...\n", chain);
+    debug("drive map begin <%p> <%d> ...\n", chain, vlnk);

-    if (chain->disk_drive == 0x80)
-    {
    disk = grub_disk_open("hd1");
    if (disk)
    {
        grub_disk_close(disk);
-            debug("drive map needed %p\n", disk);
-            chain->drive_map = 0x81;
+        hd1 = 1;
+        debug("BIOS hd1 exist\n");
    }
    else
    {
        debug("failed to open disk %s\n", "hd1");
    }
+
+    if (vlnk)
+    {
+        if (g_ventoy_disk_bios_id == 0x80 && hd1)
+        {
+            debug("drive map needed vlnk %p\n", disk);
+            chain->drive_map = 0x81;
+        }
+    }
+    else if (chain->disk_drive == 0x80)
+    {
+        if (hd1)
+        {
+            debug("drive map needed normal %p\n", disk);
+            chain->drive_map = 0x81;
+        }
    }
    else
    {
@@ -1961,7 +1976,7 @@ grub_err_t ventoy_cmd_windows_chain_data(grub_extcmd_context_t ctxt, int argc, c

    if (ventoy_is_efi_os() == 0)
    {
-        ventoy_windows_drive_map(chain);        
+        ventoy_windows_drive_map(chain, file->vlnk);        
    }

    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
@@ -2203,7 +2218,7 @@ static grub_err_t ventoy_vlnk_wim_chain_data(grub_file_t wimfile)

    if (ventoy_is_efi_os() == 0)
    {
-        ventoy_windows_drive_map(chain);        
+        ventoy_windows_drive_map(chain, 0);        
    }

    grub_file_close(file);
@@ -2357,7 +2372,7 @@ static grub_err_t ventoy_normal_wim_chain_data(grub_file_t wimfile)

    if (ventoy_is_efi_os() == 0)
    {
-        ventoy_windows_drive_map(chain);        
+        ventoy_windows_drive_map(chain, 0);        
    }

    grub_file_close(file);
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/charset.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/charset.h
@@ -0,0 +1,329 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_CHARSET_HEADER
+#define GRUB_CHARSET_HEADER	1
+
+#include <grub/types.h>
+
+#define GRUB_UINT8_1_LEADINGBIT 0x80
+#define GRUB_UINT8_2_LEADINGBITS 0xc0
+#define GRUB_UINT8_3_LEADINGBITS 0xe0
+#define GRUB_UINT8_4_LEADINGBITS 0xf0
+#define GRUB_UINT8_5_LEADINGBITS 0xf8
+#define GRUB_UINT8_6_LEADINGBITS 0xfc
+#define GRUB_UINT8_7_LEADINGBITS 0xfe
+
+#define GRUB_UINT8_1_TRAILINGBIT 0x01
+#define GRUB_UINT8_2_TRAILINGBITS 0x03
+#define GRUB_UINT8_3_TRAILINGBITS 0x07
+#define GRUB_UINT8_4_TRAILINGBITS 0x0f
+#define GRUB_UINT8_5_TRAILINGBITS 0x1f
+#define GRUB_UINT8_6_TRAILINGBITS 0x3f
+
+#define GRUB_MAX_UTF8_PER_UTF16 4
+/* You need at least one UTF-8 byte to have one UTF-16 word.
+   You need at least three UTF-8 bytes to have 2 UTF-16 words (surrogate pairs).
+ */
+#define GRUB_MAX_UTF16_PER_UTF8 1
+#define GRUB_MAX_UTF8_PER_CODEPOINT 4
+
+#define GRUB_UCS2_LIMIT 0x10000
+#define GRUB_UTF16_UPPER_SURROGATE(code) \
+  (0xD800 | ((((code) - GRUB_UCS2_LIMIT) >> 10) & 0x3ff))
+#define GRUB_UTF16_LOWER_SURROGATE(code) \
+  (0xDC00 | (((code) - GRUB_UCS2_LIMIT) & 0x3ff))
+
+/* Process one character from UTF8 sequence. 
+   At beginning set *code = 0, *count = 0. Returns 0 on failure and
+   1 on success. *count holds the number of trailing bytes.  */
+static inline int
+grub_utf8_process (grub_uint8_t c, grub_uint32_t *code, int *count)
+{
+  if (*count)
+    {
+      if ((c & GRUB_UINT8_2_LEADINGBITS) != GRUB_UINT8_1_LEADINGBIT)
+	{
+	  *count = 0;
+	  /* invalid */
+	  return 0;
+	}
+      else
+	{
+	  *code <<= 6;
+	  *code |= (c & GRUB_UINT8_6_TRAILINGBITS);
+	  (*count)--;
+	  /* Overlong.  */
+	  if ((*count == 1 && *code <= 0x1f)
+	      || (*count == 2 && *code <= 0xf))
+	    {
+	      *code = 0;
+	      *count = 0;
+	      return 0;
+	    }
+	  return 1;
+	}
+    }
+
+  if ((c & GRUB_UINT8_1_LEADINGBIT) == 0)
+    {
+      *code = c;
+      return 1;
+    }
+  if ((c & GRUB_UINT8_3_LEADINGBITS) == GRUB_UINT8_2_LEADINGBITS)
+    {
+      *count = 1;
+      *code = c & GRUB_UINT8_5_TRAILINGBITS;
+      /* Overlong */
+      if (*code <= 1)
+	{
+	  *count = 0;
+	  *code = 0;
+	  return 0;
+	}
+      return 1;
+    }
+  if ((c & GRUB_UINT8_4_LEADINGBITS) == GRUB_UINT8_3_LEADINGBITS)
+    {
+      *count = 2;
+      *code = c & GRUB_UINT8_4_TRAILINGBITS;
+      return 1;
+    }
+  if ((c & GRUB_UINT8_5_LEADINGBITS) == GRUB_UINT8_4_LEADINGBITS)
+    {
+      *count = 3;
+      *code = c & GRUB_UINT8_3_TRAILINGBITS;
+      return 1;
+    }
+  return 0;
+}
+
+
+/* Convert a (possibly null-terminated) UTF-8 string of at most SRCSIZE
+   bytes (if SRCSIZE is -1, it is ignored) in length to a UTF-16 string.
+   Return the number of characters converted. DEST must be able to hold
+   at least DESTSIZE characters. If an invalid sequence is found, return -1.
+   If SRCEND is not NULL, then *SRCEND is set to the next byte after the
+   last byte used in SRC.  */
+static inline grub_size_t
+grub_utf8_to_utf16 (grub_uint16_t *dest, grub_size_t destsize,
+		    const grub_uint8_t *src, grub_size_t srcsize,
+		    const grub_uint8_t **srcend)
+{
+  grub_uint16_t *p = dest;
+  int count = 0;
+  grub_uint32_t code = 0;
+
+  if (srcend)
+    *srcend = src;
+
+  while (srcsize && destsize)
+    {
+      int was_count = count;
+      if (srcsize != (grub_size_t)-1)
+	srcsize--;
+      if (!grub_utf8_process (*src++, &code, &count))
+	{
+	  code = '?';
+	  count = 0;
+	  /* Character c may be valid, don't eat it.  */
+	  if (was_count)
+	    src--;
+	}
+      if (count != 0)
+	continue;
+      if (code == 0)
+	break;
+      if (destsize < 2 && code >= GRUB_UCS2_LIMIT)
+	break;
+      if (code >= GRUB_UCS2_LIMIT)
+	{
+	  *p++ = GRUB_UTF16_UPPER_SURROGATE (code);
+	  *p++ = GRUB_UTF16_LOWER_SURROGATE (code);
+	  destsize -= 2;
+	}
+      else
+	{
+	  *p++ = code;
+	  destsize--;
+	}
+    }
+
+  if (srcend)
+    *srcend = src;
+  return p - dest;
+}
+
+/* Determine the last position where the UTF-8 string [beg, end) can
+   be safely cut. */
+static inline grub_size_t
+grub_getend (const char *beg, const char *end)
+{
+  const char *ptr;
+  for (ptr = end - 1; ptr >= beg; ptr--)
+    if ((*ptr & GRUB_UINT8_2_LEADINGBITS) != GRUB_UINT8_1_LEADINGBIT)
+      break;
+  if (ptr < beg)
+    return 0;
+  if ((*ptr & GRUB_UINT8_1_LEADINGBIT) == 0)
+    return ptr + 1 - beg;
+  if ((*ptr & GRUB_UINT8_3_LEADINGBITS) == GRUB_UINT8_2_LEADINGBITS
+      && ptr + 2 <= end)
+    return ptr + 2 - beg;
+  if ((*ptr & GRUB_UINT8_4_LEADINGBITS) == GRUB_UINT8_3_LEADINGBITS
+      && ptr + 3 <= end)
+    return ptr + 3 - beg;
+  if ((*ptr & GRUB_UINT8_5_LEADINGBITS) == GRUB_UINT8_4_LEADINGBITS
+      && ptr + 4 <= end)
+    return ptr + 4 - beg;
+  /* Invalid character or incomplete. Cut before it.  */
+  return ptr - beg;
+}
+
+/* Convert UTF-16 to UTF-8.  */
+static inline grub_uint8_t *
+grub_utf16_to_utf8 (grub_uint8_t *dest, const grub_uint16_t *src,
+		    grub_size_t size)
+{
+  grub_uint32_t code_high = 0;
+
+  while (size--)
+    {
+      grub_uint32_t code = *src++;
+
+      if (code_high)
+	{
+	  if (code >= 0xDC00 && code <= 0xDFFF)
+	    {
+	      /* Surrogate pair.  */
+	      code = ((code_high - 0xD800) << 10) + (code - 0xDC00) + 0x10000;
+
+	      *dest++ = (code >> 18) | 0xF0;
+	      *dest++ = ((code >> 12) & 0x3F) | 0x80;
+	      *dest++ = ((code >> 6) & 0x3F) | 0x80;
+	      *dest++ = (code & 0x3F) | 0x80;
+	    }
+	  else
+	    {
+	      /* Error...  */
+	      *dest++ = '?';
+	      /* *src may be valid. Don't eat it.  */
+	      src--;
+	    }
+
+	  code_high = 0;
+	}
+      else
+	{
+	  if (code <= 0x007F)
+	    *dest++ = code;
+	  else if (code <= 0x07FF)
+	    {
+	      *dest++ = (code >> 6) | 0xC0;
+	      *dest++ = (code & 0x3F) | 0x80;
+	    }
+	  else if (code >= 0xD800 && code <= 0xDBFF)
+	    {
+	      code_high = code;
+	      continue;
+	    }
+	  else if (code >= 0xDC00 && code <= 0xDFFF)
+	    {
+	      /* Error... */
+	      *dest++ = '?';
+	    }
+	  else if (code < 0x10000)
+	    {
+	      *dest++ = (code >> 12) | 0xE0;
+	      *dest++ = ((code >> 6) & 0x3F) | 0x80;
+	      *dest++ = (code & 0x3F) | 0x80;
+	    }
+	  else
+	    {
+	      *dest++ = (code >> 18) | 0xF0;
+	      *dest++ = ((code >> 12) & 0x3F) | 0x80;
+	      *dest++ = ((code >> 6) & 0x3F) | 0x80;
+	      *dest++ = (code & 0x3F) | 0x80;
+	    }
+	}
+    }
+
+  return dest;
+}
+
+#define GRUB_MAX_UTF8_PER_LATIN1 2
+
+/* Convert Latin1 to UTF-8.  */
+static inline grub_uint8_t *
+grub_latin1_to_utf8 (grub_uint8_t *dest, const grub_uint8_t *src,
+		     grub_size_t size)
+{
+  while (size--)
+    {
+      if (!(*src & 0x80))
+	*dest++ = *src;
+      else
+	{
+	  *dest++ = (*src >> 6) | 0xC0;
+	  *dest++ = (*src & 0x3F) | 0x80;
+	}
+      src++;
+    }
+
+  return dest;
+}
+
+/* Convert UCS-4 to UTF-8.  */
+char *grub_ucs4_to_utf8_alloc (const grub_uint32_t *src, grub_size_t size);
+
+int
+grub_is_valid_utf8 (const grub_uint8_t *src, grub_size_t srcsize);
+
+grub_ssize_t grub_utf8_to_ucs4_alloc (const char *msg,
+				      grub_uint32_t **unicode_msg,
+				      grub_uint32_t **last_position);
+
+/* Returns the number of bytes the string src would occupy is converted
+   to UTF-8, excluding \0.  */
+grub_size_t
+grub_get_num_of_utf8_bytes (const grub_uint32_t *src, grub_size_t size);
+
+/* Converts UCS-4 to UTF-8. Returns the number of bytes effectively written
+   excluding the trailing \0.  */
+grub_size_t
+grub_ucs4_to_utf8 (const grub_uint32_t *src, grub_size_t size,
+		   grub_uint8_t *dest, grub_size_t destsize);
+grub_size_t grub_utf8_to_ucs4 (grub_uint32_t *dest, grub_size_t destsize,
+			       const grub_uint8_t *src, grub_size_t srcsize,
+			       const grub_uint8_t **srcend);
+/* Returns -2 if not enough space, -1 on invalid character.  */
+grub_ssize_t
+grub_encode_utf8_character (grub_uint8_t *dest, grub_uint8_t *destend,
+			    grub_uint32_t code);
+
+const grub_uint32_t *
+grub_unicode_get_comb_start (const grub_uint32_t *str, 
+			     const grub_uint32_t *cur);
+
+int
+grub_utf8_get_num_code (const char *src, grub_size_t srcsize);
+
+const char *
+grub_utf8_offset_code (const char *src, grub_size_t srcsize, int num);
+
+#endif
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/efi/api.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/efi/api.h
@@ -314,6 +314,11 @@
    { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
  }

+#define GRUB_EFI_SMBIOS3_TABLE_GUID	\
+  { 0xf2fd1544, 0x9794, 0x4a2c, \
+    { 0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94 } \
+  }
+
 #define GRUB_EFI_SAL_TABLE_GUID \
  { 0xeb9d2d32, 0x2d88, 0x11d3, \
      { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/efi/efi.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/efi/efi.h
@@ -88,7 +88,7 @@ EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,

 void * EXPORT_FUNC (grub_efi_allocate_iso_buf) (grub_uint64_t size);
 void * EXPORT_FUNC (grub_efi_allocate_chain_buf) (grub_uint64_t size);
-
+void EXPORT_FUNC (grub_efi_get_reserved_page_num) (grub_uint64_t *total, grub_uint64_t *org_required, grub_uint64_t *new_required);

 extern void (*EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd, 
 						char **device,
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/gfxmenu_view.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/gfxmenu_view.h
@@ -0,0 +1,128 @@
+/* gfxmenu_view.h - gfxmenu view interface. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_GFXMENU_VIEW_HEADER
+#define GRUB_GFXMENU_VIEW_HEADER 1
+
+#include <grub/types.h>
+#include <grub/err.h>
+#include <grub/menu.h>
+#include <grub/font.h>
+#include <grub/gfxwidgets.h>
+
+struct grub_gfxmenu_view;   /* Forward declaration of opaque type.  */
+typedef struct grub_gfxmenu_view *grub_gfxmenu_view_t;
+
+
+grub_gfxmenu_view_t grub_gfxmenu_view_new (const char *theme_path,
+					   int width, int height);
+
+void grub_gfxmenu_view_destroy (grub_gfxmenu_view_t view);
+
+/* Set properties on the view based on settings from the specified
+   theme file.  */
+grub_err_t grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view,
+                                         const char *theme_path);
+
+grub_err_t grub_gui_recreate_box (grub_gfxmenu_box_t *boxptr,
+                                  const char *pattern, const char *theme_dir);
+
+void grub_gfxmenu_view_draw (grub_gfxmenu_view_t view);
+
+void
+grub_gfxmenu_redraw_menu (grub_gfxmenu_view_t view);
+
+void
+grub_gfxmenu_redraw_timeout (grub_gfxmenu_view_t view);
+
+void
+grub_gfxmenu_view_redraw (grub_gfxmenu_view_t view,
+			  const grub_video_rect_t *region);
+
+void 
+grub_gfxmenu_clear_timeout (void *data);
+void 
+grub_gfxmenu_print_timeout (int timeout, void *data);
+void
+grub_gfxmenu_set_chosen_entry (int entry, void *data);
+void
+grub_gfxmenu_scroll_chosen_entry (void *data, int diren);
+
+grub_err_t grub_font_draw_string (const char *str,
+				  grub_font_t font,
+				  grub_video_color_t color,
+				  int left_x, int baseline_y);
+int grub_font_get_string_width (grub_font_t font,
+				const char *str);
+
+
+/* Implementation details -- this should not be used outside of the
+   view itself.  */
+
+#include <grub/video.h>
+#include <grub/bitmap.h>
+#include <grub/bitmap_scale.h>
+#include <grub/gui.h>
+#include <grub/gfxwidgets.h>
+#include <grub/icon_manager.h>
+
+/* Definition of the private representation of the view.  */
+struct grub_gfxmenu_view
+{
+  grub_video_rect_t screen;
+
+  int need_to_check_sanity;
+  grub_video_rect_t terminal_rect;
+  int terminal_border;
+
+  grub_font_t title_font;
+  grub_font_t message_font;
+  char *terminal_font_name;
+  grub_video_rgba_color_t title_color;
+  grub_video_rgba_color_t message_color;
+  grub_video_rgba_color_t message_bg_color;
+  struct grub_video_bitmap *raw_desktop_image;
+  struct grub_video_bitmap *scaled_desktop_image;
+  grub_video_bitmap_selection_method_t desktop_image_scale_method;
+  grub_video_bitmap_h_align_t desktop_image_h_align;
+  grub_video_bitmap_v_align_t desktop_image_v_align;
+  grub_video_rgba_color_t desktop_color;
+  grub_gfxmenu_box_t terminal_box;
+  char *title_text;
+  char *progress_message_text;
+  char *theme_path;
+
+  grub_gui_container_t canvas;
+
+  int double_repaint;
+
+  int selected;
+
+  grub_video_rect_t progress_message_frame;
+
+  grub_menu_t menu;
+
+  int nested;
+
+  int first_timeout;
+
+  int *menu_title_offset;
+};
+
+#endif /* ! GRUB_GFXMENU_VIEW_HEADER */
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/menu_viewer.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/menu_viewer.h
@@ -0,0 +1,49 @@
+/* menu_viewer.h - Interface to menu viewer implementations. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_MENU_VIEWER_HEADER
+#define GRUB_MENU_VIEWER_HEADER 1
+
+#include <grub/err.h>
+#include <grub/symbol.h>
+#include <grub/types.h>
+#include <grub/menu.h>
+#include <grub/term.h>
+
+struct grub_menu_viewer
+{
+  struct grub_menu_viewer *next;
+  void *data;
+  void (*set_chosen_entry) (int entry, void *data);
+  void (*scroll_chosen_entry) (void *data, int diren);
+  void (*print_timeout) (int timeout, void *data);
+  void (*clear_timeout) (void *data);
+  void (*fini) (void *fini);
+};
+
+void grub_menu_register_viewer (struct grub_menu_viewer *viewer);
+
+grub_err_t
+grub_menu_try_text (struct grub_term_output *term, 
+		    int entry, grub_menu_t menu, int nested);
+
+extern grub_err_t (*grub_gfxmenu_try_hook) (int entry, grub_menu_t menu,
+					    int nested);
+
+#endif /* GRUB_MENU_VIEWER_HEADER */
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/smbios.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/smbios.h
@@ -0,0 +1,69 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2019  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_SMBIOS_HEADER
+#define GRUB_SMBIOS_HEADER	1
+
+#include <grub/symbol.h>
+#include <grub/types.h>
+
+#define GRUB_SMBIOS_TYPE_END_OF_TABLE ((grub_uint8_t)127)
+
+struct grub_smbios_ieps
+{
+  grub_uint8_t anchor[5]; /* "_DMI_" */
+  grub_uint8_t checksum;
+  grub_uint16_t table_length;
+  grub_uint32_t table_address;
+  grub_uint16_t structures;
+  grub_uint8_t revision;
+} GRUB_PACKED;
+
+struct grub_smbios_eps
+{
+  grub_uint8_t anchor[4]; /* "_SM_" */
+  grub_uint8_t checksum;
+  grub_uint8_t length; /* 0x1f */
+  grub_uint8_t version_major;
+  grub_uint8_t version_minor;
+  grub_uint16_t maximum_structure_size;
+  grub_uint8_t revision;
+  grub_uint8_t formatted[5];
+  struct grub_smbios_ieps intermediate;
+} GRUB_PACKED;
+
+struct grub_smbios_eps3
+{
+  grub_uint8_t anchor[5]; /* "_SM3_" */
+  grub_uint8_t checksum;
+  grub_uint8_t length; /* 0x18 */
+  grub_uint8_t version_major;
+  grub_uint8_t version_minor;
+  grub_uint8_t docrev;
+  grub_uint8_t revision;
+  grub_uint8_t reserved;
+  grub_uint32_t maximum_table_length;
+  grub_uint64_t table_address;
+} GRUB_PACKED;
+
+extern struct grub_smbios_eps *grub_machine_smbios_get_eps (void);
+extern struct grub_smbios_eps3 *grub_machine_smbios_get_eps3 (void);
+
+extern struct grub_smbios_eps *EXPORT_FUNC (grub_smbios_get_eps) (void);
+
+#endif /* ! GRUB_SMBIOS_HEADER */
--- a/GRUB2/MOD_SRC/grub-2.04/install.sh
+++ b/GRUB2/MOD_SRC/grub-2.04/install.sh
@@ -9,13 +9,13 @@ mkdir -p $VT_DIR/GRUB2/PXE

 make install

-PATH=$PATH:$VT_DIR/GRUB2/INSTALL/bin/:$VT_DIR/GRUB2/INSTALL/sbin/
+PATH=$VT_DIR/GRUB2/INSTALL/bin/:$VT_DIR/GRUB2/INSTALL/sbin/:$PATH

 net_modules_legacy="net tftp http"
-all_modules_legacy="file setkey date drivemap blocklist regexp newc vga_text ntldr search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio lspci pci ext2 xfs ventoy chain read halt iso9660 linux16 test true sleep reboot echo videotest videoinfo videotest_checksum video_colors video_cirrus video_bochs vga vbe video_fb font video gettext extcmd terminal  linux minicmd help configfile tr trig boot biosdisk disk ls tar squash4 password_pbkdf2 all_video png jpeg part_gpt part_msdos fat exfat ntfs loopback gzio normal  udf gfxmenu gfxterm gfxterm_background gfxterm_menu"
+all_modules_legacy="file setkey date drivemap blocklist regexp newc vga_text ntldr search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio lspci pci ext2 xfs ventoy chain read halt iso9660 linux16 test true sleep reboot echo videotest videoinfo videotest_checksum video_colors video_cirrus video_bochs vga vbe video_fb font video gettext extcmd terminal  linux minicmd help configfile tr trig boot biosdisk disk ls tar squash4 password_pbkdf2 all_video png jpeg part_gpt part_msdos fat exfat ntfs loopback gzio normal  udf gfxmenu gfxterm gfxterm_background gfxterm_menu smbios"

 net_modules_uefi="efinet net tftp http"
-all_modules_uefi="file setkey blocklist ventoy test true regexp newc search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux relocator jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop efi_uga video_bochs video_cirrus video video_fb gfxterm_background gfxterm_menu"
+all_modules_uefi="file setkey blocklist ventoy test true regexp newc search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux relocator jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop efi_uga video_bochs video_cirrus video video_fb gfxterm_background gfxterm_menu mouse fwload smbios"

 all_modules_arm64_uefi="file setkey blocklist ventoy test true regexp newc search  gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop video video_fb gfxterm_background gfxterm_menu"

--- a/GRUB2/MOD_SRC/grub-2.04/util/grub-install.c
+++ b/GRUB2/MOD_SRC/grub-2.04/util/grub-install.c
@@ -1165,6 +1165,7 @@ main (int argc, char *argv[])
 	      break;
 	    case GRUB_INSTALL_PLATFORM_MIPS64EL_EFI:
 	      efi_file = "grubmips64el.efi";
+          break;
 	    case GRUB_INSTALL_PLATFORM_RISCV32_EFI:
 	      efi_file = "grubriscv32.efi";
 	      break;
--- a/IMG/cpio/ventoy/hook/alpine/insert.sh
+++ b/IMG/cpio/ventoy/hook/alpine/insert.sh
@@ -0,0 +1,4 @@
+for i in 1 2; do 
+if [ $i -eq 2 ]; then
+    /ventoy/busybox/sh /ventoy/hook/alpine/udev_disk_hook.sh
+fi
--- a/IMG/cpio/ventoy/hook/alpine/udev_disk_hook.sh
+++ b/IMG/cpio/ventoy/hook/alpine/udev_disk_hook.sh
@@ -19,22 +19,17 @@

 . /ventoy/hook/ventoy-hook-lib.sh

-if [ "$SUBSYSTEM" != "block" ] || [ "$DEVTYPE" != "partition" ]; then    
-    exit 0
-fi
-
-if [ -b /dev/${MDEV:0:-1} ]; then
-    vtlog "/dev/${MDEV:0:-1} exist"
-else
-    $SLEEP 2
-fi
-
-if is_ventoy_hook_finished || not_ventoy_disk "${MDEV:0:-1}"; then
-    exit 0
-fi
-
 PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH

+wait_for_usb_disk_ready
+
+vtdiskname=$(get_ventoy_disk_name)
+if [ "$vtdiskname" = "unknown" ]; then
+    vtlog "ventoy disk not found"
+    PATH=$VTPATH_OLD
+    exit 0
+fi
+
 #
 # longpanda:
 # Alpine initramfs doesn't contain dm-mod or fuse module, 
@@ -47,13 +42,17 @@ PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
 #   3. unmount and delete the squashfs file
 #

+MDEV="${vtdiskname#/dev/}2"
+
 vtoydm -i -f $VTOY_PATH/ventoy_image_map -d /dev/${MDEV:0:-1} > $VTOY_PATH/iso_file_list

 vtLine=$(grep '[-][-] modloop-lts ' $VTOY_PATH/iso_file_list)
 sector=$(echo $vtLine | awk '{print $(NF-1)}')
 length=$(echo $vtLine | awk '{print $NF}')

+echo -n "Mounting boot media, please wait ......"
 vtoydm -e -f $VTOY_PATH/ventoy_image_map -d /dev/${MDEV:0:-1} -s $sector -l $length -o /vt_modloop
+echo "done"

 mkdir -p $VTOY_PATH/mnt
 mount /vt_modloop $VTOY_PATH/mnt
--- a/IMG/cpio/ventoy/hook/alpine/ventoy-hook.sh
+++ b/IMG/cpio/ventoy/hook/alpine/ventoy-hook.sh
@@ -19,6 +19,17 @@

 . $VTOY_PATH/hook/ventoy-os-lib.sh

-echo "-[-a-z0-9]*2 root:root 0666 @$BUSYBOX_PATH/sh $VTOY_PATH/hook/alpine/udev_disk_hook.sh" >> /mdev.conf
-$CAT /etc/mdev.conf >> /mdev.conf
-$BUSYBOX_PATH/mv /mdev.conf /etc/mdev.conf
+PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
+
+LineBegin=$(grep -n "ebegin.*Mounting boot media" /init | awk -F: '{print $1}')
+
+grep -n "^eend" /init > /t.list
+while read line; do
+    LineEnd=$(echo $line | awk -F: '{print $1}')
+    if [ $LineEnd -gt $LineBegin ]; then
+        sed "${LineEnd}i\done" -i /init
+        sed "${LineBegin}r /ventoy/hook/alpine/insert.sh" -i /init        
+        break
+    fi
+done < /t.list
+rm -f /t.list
--- a/IMG/cpio/ventoy/hook/blackPanther/ventoy-hook.sh
+++ b/IMG/cpio/ventoy/hook/blackPanther/ventoy-hook.sh
@@ -22,4 +22,4 @@
 ventoy_set_inotify_script  blackPanther/ventoy-inotifyd-hook.sh
 $BUSYBOX_PATH/cp -a $VTOY_PATH/hook/blackPanther/ventoy-inotifyd-start.sh /lib/dracut/hooks/pre-udev/00-ventoy-inotifyd-start.sh

-$SED "s#printf\(.*\)\$CMDLINE#printf\1 root=/dev/dm-0 \$CMDLINE root=/dev/dm-0#" -i /lib/dracut-lib.sh
+$SED "s#printf\(.*\)\$CMDLINE#printf\1 root=/dev/ventoy \$CMDLINE root=/dev/ventoy#" -i /lib/dracut-lib.sh
--- a/IMG/cpio/ventoy/hook/blackPanther/ventoy-inotifyd-hook.sh
+++ b/IMG/cpio/ventoy/hook/blackPanther/ventoy-inotifyd-hook.sh
@@ -33,10 +33,8 @@ if is_inotify_ventoy_part $3; then
    $BUSYBOX_PATH/sh $VTOY_PATH/hook/default/udev_disk_hook.sh $3 noreplace

    blkdev_num_dev=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1 \2/')  
-    if ! [ -e /dev/dm-0 ]; then
-        mknod -m 660 /dev/dm-0 b $blkdev_num_dev
-    fi
-    blackPanther-root /dev/dm-0
+    mknod -m 660 /dev/ventoy b $blkdev_num_dev
+    blackPanther-root /dev/ventoy

    set_ventoy_hook_finish   
 else
--- a/IMG/cpio/ventoy/hook/debian/default-hook.sh
+++ b/IMG/cpio/ventoy/hook/debian/default-hook.sh
@@ -64,6 +64,10 @@ if [ -f $VTOY_PATH/autoinstall ]; then
            $SED "/^mount \/proc/a export file=$VTOY_PATH/autoinstall; export auto='true'; export priority='critical'"  -i /init
        fi
    fi
+    
+    # if [ -e /bin/check-missing-firmware ]; then
+    #     $SED "/^#!/a\exit 0" -i /bin/check-missing-firmware
+    # fi
 fi

 #for ARMA aka Omoikane
--- a/IMG/cpio/ventoy/hook/debian/udev_disk_hook.sh
+++ b/IMG/cpio/ventoy/hook/debian/udev_disk_hook.sh
@@ -138,6 +138,14 @@ else
    fi
 fi

+#special process for Linx
+if $BUSYBOX_PATH/uname -r | $GREP -q "^2\.6"; then
+    if $GREP -q "linx" /proc/version; then
+        blkdev_num=$($VTOY_PATH/tool/dmsetup ls | $GREP ventoy | $SED 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
+        vtDM=$(ventoy_find_dm_id ${blkdev_num}) 
+        echo "/dev/$vtDM" > /ventoy/list-devices-usb-part
+    fi
+fi

 # OK finish
 set_ventoy_hook_finish
--- a/IMG/cpio/ventoy/hook/easystartup/disk_hook.sh
+++ b/IMG/cpio/ventoy/hook/easystartup/disk_hook.sh
@@ -78,6 +78,9 @@ fi

 ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace"

-ln -s /dev/dm-0 /dev/root
+blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')
+vtDM=$(ventoy_find_dm_id ${blkdev_num})
+cp -a /dev/$vtDM /dev/ventoy
+ln -s /dev/$vtDM /dev/root

 PATH=$VTPATH_OLD
--- a/IMG/cpio/ventoy/hook/easystartup/ventoy-hook.sh
+++ b/IMG/cpio/ventoy/hook/easystartup/ventoy-hook.sh
@@ -19,5 +19,5 @@

 . $VTOY_PATH/hook/ventoy-os-lib.sh

-$SED "s#^CDROM=.*#CDROM=/dev/dm-0#" -i /init
+$SED "s#^CDROM=.*#CDROM=/dev/ventoy#" -i /init
 $BUSYBOX_PATH/cp -a $VTOY_PATH/hook/easystartup/ventoy-initqueue.sh  /initqueue/ventoy.sh
--- a/IMG/cpio/ventoy/hook/gobo/ventoy-inotifyd-hook.sh
+++ b/IMG/cpio/ventoy/hook/gobo/ventoy-inotifyd-hook.sh
@@ -31,16 +31,6 @@ if is_inotify_ventoy_part $3; then
    vtlog "find ventoy partition $3 ..."
    $BUSYBOX_PATH/sh $VTOY_PATH/hook/default/udev_disk_hook.sh $3 noreplace
    
-    # blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
-    # vtDM=$(ventoy_find_dm_id ${blkdev_num})
-    # 
-    # if [ "$vtDM" = "dm-0" ]; then
-    #     vtlog "This is dm-0, OK ..."
-    # else
-    #     vtlog "####### This is $vtDM ####### this is abnormal ..."
-    #     ventoy_swap_device /dev/dm-0 /dev/$vtDM
-    # fi
-    
    set_ventoy_hook_finish
 else
    vtlog "##### INOTIFYD: $2/$3 is created (NO)..."
--- a/IMG/cpio/ventoy/hook/lunar/ventoy-hook.sh
+++ b/IMG/cpio/ventoy/hook/lunar/ventoy-hook.sh
@@ -19,7 +19,7 @@

 . $VTOY_PATH/hook/ventoy-os-lib.sh

-$SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE root=/dev/dm-0#" -i /lib/dracut-lib.sh
+$SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE root=/dev/ventoy#" -i /lib/dracut-lib.sh

 $BUSYBOX_PATH/rm -f /usr/lib/systemd/system-generators/systemd-fstab-generator /lib/systemd/system-generators/systemd-fstab-generator

--- a/IMG/cpio/ventoy/hook/lunar/ventoy-inotifyd-hook.sh
+++ b/IMG/cpio/ventoy/hook/lunar/ventoy-inotifyd-hook.sh
@@ -35,7 +35,8 @@ if is_inotify_ventoy_part $3; then
    blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')
    vtDM=$(ventoy_find_dm_id ${blkdev_num})

-    mount -t iso9660 /dev/$vtDM /sysroot
+    cp -a /dev/$vtDM /dev/ventoy
+    mount -t iso9660 /dev/ventoy /sysroot
    
    set_ventoy_hook_finish
 else
--- a/IMG/cpio/ventoy/hook/mageia/ventoy-inotifyd-hook.sh
+++ b/IMG/cpio/ventoy/hook/mageia/ventoy-inotifyd-hook.sh
@@ -59,7 +59,7 @@ if is_inotify_ventoy_part $3; then
        $BUSYBOX_PATH/cp -a $BUSYBOX_PATH/blkid /sbin/blkid
        $BUSYBOX_PATH/mkdir -p /dev/mapper
        ln -s /dev/$vtDM  /dev/mapper/ventoy     
-        /sbin/mgalive-root /dev/dm-0    
+        /sbin/mgalive-root /dev/$vtDM
    fi
    
    set_ventoy_hook_finish
--- a/IMG/cpio/ventoy/hook/openEuler/ventoy-hook.sh
+++ b/IMG/cpio/ventoy/hook/openEuler/ventoy-hook.sh
@@ -25,13 +25,19 @@ else
    for vtParam in $($CAT /proc/cmdline); do
        if echo $vtParam | $GREP -q 'inst.ks=hd:LABEL='; then
            vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
-            VTKS="inst.ks=hd:/dev/dm-0:$vtRawKs"
+            VTKS="inst.ks=hd:/dev/ventoy:$vtRawKs"
            break
        fi
        
        if echo $vtParam | $GREP -q '^ks=.*:/'; then
            vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
-            VTKS="ks=hd:/dev/dm-0:$vtRawKs"
+            VTKS="ks=hd:/dev/ventoy:$vtRawKs"
+            break
+        fi
+        
+        if echo $vtParam | $GREP -q '^inst.ks=.*:/'; then
+            vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
+            VTKS="inst.ks=hd:/dev/ventoy:$vtRawKs"
            break
        fi
    done
@@ -54,9 +60,12 @@ if [ -f $VTOY_PATH/ventoy_persistent_map ]; then
    $BUSYBOX_PATH/rm -rf $VTOY_PATH/selinuxfs
 fi

-
 echo "VTKS=$VTKS  VTOVERLAY=$VTOVERLAY" >> $VTLOG

+if [ -n "$vtRawKs" ]; then
+    echo "$vtRawKs" > $VTOY_PATH/ventoy_ks_rootpath
+fi
+
 if ls $VTOY_PATH | $GREP -q 'ventoy_dud[0-9]'; then
    for vtDud in $(ls $VTOY_PATH/ventoy_dud*); do
        vtInstDD="$vtInstDD inst.dd=file:$vtDud"
@@ -64,7 +73,7 @@ if ls $VTOY_PATH | $GREP -q 'ventoy_dud[0-9]'; then
 fi
 echo "vtInstDD=$vtInstDD" >> $VTLOG

-$SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE inst.stage2=hd:/dev/dm-0 $VTKS $vtInstDD#" -i /lib/dracut-lib.sh
+$SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE inst.stage2=hd:/dev/ventoy $VTKS $VTOVERLAY $vtInstDD#" -i /lib/dracut-lib.sh

 ventoy_set_inotify_script  openEuler/ventoy-inotifyd-hook.sh

--- a/IMG/cpio/ventoy/hook/openEuler/ventoy-inotifyd-hook.sh
+++ b/IMG/cpio/ventoy/hook/openEuler/ventoy-inotifyd-hook.sh
@@ -35,19 +35,23 @@ if is_inotify_ventoy_part $3; then
    
    $BUSYBOX_PATH/sh $VTOY_PATH/hook/default/udev_disk_hook.sh $3 
    
-    blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
-    vtDM=$(ventoy_find_dm_id ${blkdev_num})
+    blkdev_num_mknod=$($VTOY_PATH/tool/dmsetup ls | $GREP ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1 \2/')
+    $BUSYBOX_PATH/mknod -m 660 /dev/ventoy  b  $blkdev_num_mknod
+    $BUSYBOX_PATH/modprobe isofs >/dev/null 2>&1
+    vtlog "mknod /dev/ventoy $blkdev_num_mknod"
    
-    if [ "$vtDM" = "dm-0" ]; then
-        vtlog "This is dm-0, OK ..."
-    else
-        vtlog "####### This is $vtDM ####### this is abnormal ..."
-        ventoy_swap_device /dev/dm-0 /dev/$vtDM
+    if [ -f $VTOY_PATH/ventoy_ks_rootpath ]; then
+        vt_ks_rootpath=$(cat $VTOY_PATH/ventoy_ks_rootpath)
+        vtlog "ks rootpath <$vt_ks_rootpath>"
+        if [ -e /sbin/fetch-kickstart-disk ]; then
+            vtlog "fetch-kickstart-disk ..."        
+            /sbin/fetch-kickstart-disk /dev/ventoy "$vt_ks_rootpath"
+        fi
    fi
    
    if [ -e /sbin/anaconda-diskroot ]; then
        vtlog "set anaconda-diskroot ..."        
-        /sbin/anaconda-diskroot /dev/dm-0    
+        /sbin/anaconda-diskroot /dev/ventoy
    fi
    
    set_ventoy_hook_finish
--- a/IMG/cpio/ventoy/hook/openEuler/ventoy-make-link.sh
+++ b/IMG/cpio/ventoy/hook/openEuler/ventoy-make-link.sh
@@ -19,17 +19,24 @@

 . /ventoy/hook/ventoy-hook-lib.sh

-if ! [ -e /dev/mapper/ventoy ]; then
-    vtlog "link to /dev/mapper/ventoy"
-    ln -s /dev/dm-0 /dev/mapper/ventoy
+if [ ! -e /dev/dm-0 ]; then
+    exit 0
 fi

-VTLABEL=$($BUSYBOX_PATH/blkid /dev/dm-0 | $SED 's/.*LABEL="\([^"]*\)".*/\1/')
+blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
+vtDM=$(ventoy_find_dm_id ${blkdev_num})
+
+if ! [ -e /dev/mapper/ventoy ]; then
+    vtlog "link /dev/$vtDM to /dev/mapper/ventoy"
+    ln -s /dev/$vtDM /dev/mapper/ventoy
+fi
+
+VTLABEL=$($BUSYBOX_PATH/blkid /dev/$vtDM | $SED 's/.*LABEL="\([^"]*\)".*/\1/')
 vtlog "VTLABEL=$VTLABEL"

 if [ -n "$VTLABEL" ]; then
    if ! [ -e "/dev/disk/by-label/$VTLABEL" ]; then
-        vtlog "link to /dev/disk/by-label/$VTLABEL"
-        ln -s /dev/dm-0 "/dev/disk/by-label/$VTLABEL"
+        vtlog "link /dev/$vtDM to /dev/disk/by-label/$VTLABEL"
+        ln -s /dev/$vtDM "/dev/disk/by-label/$VTLABEL"
    fi
 fi
--- a/IMG/cpio/ventoy/hook/openEuler/ventoy-timeout.sh
+++ b/IMG/cpio/ventoy/hook/openEuler/ventoy-timeout.sh
@@ -23,12 +23,23 @@ vtlog "##### $0 $* ..."

 VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH

-blkdev_num=$(dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
-vtDM=$(ventoy_find_dm_id ${blkdev_num})
+if [ ! -e /dev/ventoy ]; then
+    blkdev_num_mknod=$(dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1 \2/')
+    mknod -m 660 /dev/ventoy  b  $blkdev_num_mknod
+fi
+
+if [ -f $VTOY_PATH/ventoy_ks_rootpath ]; then
+    vt_ks_rootpath=$(cat $VTOY_PATH/ventoy_ks_rootpath)
+    vtlog "ks rootpath <$vt_ks_rootpath>"
+    if [ -e /sbin/fetch-kickstart-disk ]; then
+        vtlog "fetch-kickstart-disk ..."        
+        /sbin/fetch-kickstart-disk /dev/ventoy "$vt_ks_rootpath"
+    fi
+fi

 if [ -e /sbin/anaconda-diskroot ]; then
-    vtlog "set anaconda-diskroot ..."
-    /sbin/anaconda-diskroot /dev/dm-0    
+    vtlog "set anaconda-diskroot /dev/ventoy ..."
+    /sbin/anaconda-diskroot /dev/ventoy
 fi

 PATH=$VTPATH_OLD
--- a/IMG/cpio/ventoy/hook/primeos/ventoy-hook.sh
+++ b/IMG/cpio/ventoy/hook/primeos/ventoy-hook.sh
@@ -21,5 +21,12 @@

 $BUSYBOX_PATH/mkdir /dev

-$SED '/Detecting *PrimeOS/a\ ROOT=$(cat /ventoy/rootdev)' -i /init
-$SED "/Detecting *PrimeOS/a\ $BUSYBOX_PATH/sh  $VTOY_PATH/hook/primeos/ventoy-disk.sh" -i /init
+if $GREP -q 'Detecting *PrimeOS' /init; then
+    $SED '/Detecting *PrimeOS/a\ ROOT=$(cat /ventoy/rootdev)' -i /init
+    $SED "/Detecting *PrimeOS/a\ $BUSYBOX_PATH/sh  $VTOY_PATH/hook/primeos/ventoy-disk.sh" -i /init
+elif $GREP -q 'Detecting *PRIMEOS' /init; then
+    $SED '/Detecting *PRIMEOS/a\ ROOT=$(cat /ventoy/rootdev)' -i /init
+    $SED "/Detecting *PRIMEOS/a\ $BUSYBOX_PATH/sh  $VTOY_PATH/hook/primeos/ventoy-disk.sh" -i /init
+else
+    echo "not detecting found" >> $VTLOG
+fi
--- a/IMG/cpio/ventoy/hook/rhel7/ventoy-hook.sh
+++ b/IMG/cpio/ventoy/hook/rhel7/ventoy-hook.sh
@@ -28,13 +28,19 @@ else
    for vtParam in $($CAT /proc/cmdline); do
        if echo $vtParam | $GREP -q 'inst.ks=hd:LABEL='; then
            vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
-            VTKS="inst.ks=hd:/dev/dm-0:$vtRawKs"
+            VTKS="inst.ks=hd:/dev/ventoy:$vtRawKs"
            break
        fi
        
        if echo $vtParam | $GREP -q '^ks=.*:/'; then
            vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
-            VTKS="ks=hd:/dev/dm-0:$vtRawKs"
+            VTKS="ks=hd:/dev/ventoy:$vtRawKs"
+            break
+        fi
+        
+        if echo $vtParam | $GREP -q '^inst.ks=.*:/'; then
+            vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
+            VTKS="inst.ks=hd:/dev/ventoy:$vtRawKs"
            break
        fi
    done
@@ -58,9 +64,12 @@ if [ -f $VTOY_PATH/ventoy_persistent_map ]; then
    $BUSYBOX_PATH/rm -rf $VTOY_PATH/selinuxfs
 fi

-
 echo "VTKS=$VTKS  VTOVERLAY=$VTOVERLAY" >> $VTLOG

+if [ -n "$vtRawKs" ]; then
+    echo "$vtRawKs" > $VTOY_PATH/ventoy_ks_rootpath
+fi
+
 if ls $VTOY_PATH | $GREP -q 'ventoy_dud[0-9]'; then
    for vtDud in $(ls $VTOY_PATH/ventoy_dud*); do
        vtInstDD="$vtInstDD inst.dd=file:$vtDud"
@@ -69,9 +78,9 @@ fi
 echo "vtInstDD=$vtInstDD" >> $VTLOG

 if $GREP -q 'root=live' /proc/cmdline; then
-    $SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE root=live:/dev/dm-0 $VTKS $VTOVERLAY $vtInstDD#" -i /lib/dracut-lib.sh
+    $SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE root=live:/dev/ventoy $VTKS $VTOVERLAY $vtInstDD#" -i /lib/dracut-lib.sh
 else
-    $SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE inst.stage2=hd:/dev/dm-0 $VTKS $VTOVERLAY $vtInstDD#" -i /lib/dracut-lib.sh
+    $SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE inst.stage2=hd:/dev/ventoy $VTKS $VTOVERLAY $vtInstDD#" -i /lib/dracut-lib.sh
 fi

 ventoy_set_inotify_script  rhel7/ventoy-inotifyd-hook.sh
--- a/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh
+++ b/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh
@@ -29,14 +29,7 @@ if is_inotify_ventoy_part $3; then

    vtlog "##### INOTIFYD: $2/$3 is created (YES) ..."

-    vtGenRulFile='/etc/udev/rules.d/99-live-squash.rules'
-    if [ -e $vtGenRulFile ] && $GREP -q dmsquash $vtGenRulFile; then
-        vtScript=$($GREP -m1 'RUN.=' $vtGenRulFile | $AWK -F'RUN.=' '{print $2}' | $SED 's/"\(.*\)".*/\1/')
-        vtlog "vtScript=$vtScript"
-        $vtScript
-    else
-        vtlog "$vtGenRulFile not exist..."
-    fi
+    

    vtlog "find ventoy partition ..."
    
@@ -47,19 +40,32 @@ if is_inotify_ventoy_part $3; then
    
    $BUSYBOX_PATH/sh $VTOY_PATH/hook/default/udev_disk_hook.sh $3 $vtReplaceOpt
    
-    blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
-    vtDM=$(ventoy_find_dm_id ${blkdev_num})
+    blkdev_num_mknod=$($VTOY_PATH/tool/dmsetup ls | $GREP ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1 \2/')
+    $BUSYBOX_PATH/mknod -m 660 /dev/ventoy  b  $blkdev_num_mknod
+    $BUSYBOX_PATH/modprobe isofs >/dev/null 2>&1
+    vtlog "mknod /dev/ventoy $blkdev_num_mknod"

-    if [ "$vtDM" = "dm-0" ]; then
-        vtlog "This is dm-0, OK ..."
+    vtGenRulFile='/etc/udev/rules.d/99-live-squash.rules'
+    if [ -e $vtGenRulFile ] && $GREP -q dmsquash $vtGenRulFile; then
+        vtScript=$($GREP -m1 'RUN.=' $vtGenRulFile | $AWK -F'RUN.=' '{print $2}' | $SED 's/"\(.*\)".*/\1/')
+        vtlog "vtScript=$vtScript"
+        $vtScript
    else
-        vtlog "####### This is $vtDM ####### this is abnormal ..."
-        ventoy_swap_device /dev/dm-0 /dev/$vtDM
+        vtlog "$vtGenRulFile not exist..."
+    fi
+    
+    if [ -f $VTOY_PATH/ventoy_ks_rootpath ]; then
+        vt_ks_rootpath=$(cat $VTOY_PATH/ventoy_ks_rootpath)
+        vtlog "ks rootpath <$vt_ks_rootpath>"
+        if [ -e /sbin/fetch-kickstart-disk ]; then
+            vtlog "fetch-kickstart-disk ..."        
+            /sbin/fetch-kickstart-disk /dev/ventoy "$vt_ks_rootpath"
+        fi
    fi
    
    if [ -e /sbin/anaconda-diskroot ]; then
        vtlog "set anaconda-diskroot ..."        
-        /sbin/anaconda-diskroot /dev/dm-0    
+        /sbin/anaconda-diskroot /dev/ventoy
    fi
    
    set_ventoy_hook_finish
--- a/IMG/cpio/ventoy/hook/rhel7/ventoy-make-link.sh
+++ b/IMG/cpio/ventoy/hook/rhel7/ventoy-make-link.sh
@@ -19,17 +19,24 @@

 . /ventoy/hook/ventoy-hook-lib.sh

-if ! [ -e /dev/mapper/ventoy ]; then
-    vtlog "link to /dev/mapper/ventoy"
-    ln -s /dev/dm-0 /dev/mapper/ventoy
+if [ ! -e /dev/dm-0 ]; then
+    exit 0
 fi

-VTLABEL=$($BUSYBOX_PATH/blkid /dev/dm-0 | $SED 's/.*LABEL="\([^"]*\)".*/\1/')
+blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
+vtDM=$(ventoy_find_dm_id ${blkdev_num})
+
+if ! [ -e /dev/mapper/ventoy ]; then
+    vtlog "link /dev/$vtDM to /dev/mapper/ventoy"
+    ln -s /dev/$vtDM /dev/mapper/ventoy
+fi
+
+VTLABEL=$($BUSYBOX_PATH/blkid /dev/$vtDM | $SED 's/.*LABEL="\([^"]*\)".*/\1/')
 vtlog "VTLABEL=$VTLABEL"

 if [ -n "$VTLABEL" ]; then
    if ! [ -e "/dev/disk/by-label/$VTLABEL" ]; then
-        vtlog "link to /dev/disk/by-label/$VTLABEL"
-        ln -s /dev/dm-0 "/dev/disk/by-label/$VTLABEL"
+        vtlog "link /dev/$vtDM to /dev/disk/by-label/$VTLABEL"
+        ln -s /dev/$vtDM "/dev/disk/by-label/$VTLABEL"
    fi
 fi
--- a/IMG/cpio/ventoy/hook/rhel7/ventoy-timeout.sh
+++ b/IMG/cpio/ventoy/hook/rhel7/ventoy-timeout.sh
@@ -23,12 +23,23 @@ vtlog "##### $0 $* ..."

 VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH

-blkdev_num=$(dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
-vtDM=$(ventoy_find_dm_id ${blkdev_num})
+if [ ! -e /dev/ventoy ]; then
+    blkdev_num_mknod=$(dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1 \2/')
+    mknod -m 660 /dev/ventoy  b  $blkdev_num_mknod
+fi
+
+if [ -f $VTOY_PATH/ventoy_ks_rootpath ]; then
+    vt_ks_rootpath=$(cat $VTOY_PATH/ventoy_ks_rootpath)
+    vtlog "ks rootpath <$vt_ks_rootpath>"
+    if [ -e /sbin/fetch-kickstart-disk ]; then
+        vtlog "fetch-kickstart-disk ..."        
+        /sbin/fetch-kickstart-disk /dev/ventoy "$vt_ks_rootpath"
+    fi
+fi

 if [ -e /sbin/anaconda-diskroot ]; then
-    vtlog "set anaconda-diskroot ..."
-    /sbin/anaconda-diskroot /dev/dm-0    
+    vtlog "set anaconda-diskroot /dev/ventoy ..."
+    /sbin/anaconda-diskroot /dev/ventoy
 fi

 PATH=$VTPATH_OLD
--- a/IMG/cpio/ventoy/hook/suse/disk_hook.sh
+++ b/IMG/cpio/ventoy/hook/suse/disk_hook.sh
@@ -32,7 +32,8 @@ ventoy_os_install_dmsetup_by_fuse() {

    mount -t iso9660  $VTOY_PATH/mnt/fuse/ventoy.iso    $VTOY_PATH/mnt/iso
    
-    mount -t squashfs $VTOY_PATH/mnt/iso/system/squashfs_sys.img  $VTOY_PATH/mnt/squashfs
+    [ -f $VTOY_PATH/mnt/iso/system/squashfs_sys.img ] && mount -t squashfs $VTOY_PATH/mnt/iso/system/squashfs_sys.img  $VTOY_PATH/mnt/squashfs
+    [ -f $VTOY_PATH/mnt/iso/system/squashfs.img ] && mount -t squashfs $VTOY_PATH/mnt/iso/system/squashfs.img  $VTOY_PATH/mnt/squashfs

    KoName=$(ls $VTOY_PATH/mnt/squashfs/lib/modules/$2/kernel/drivers/md/dm-mod.ko*)
    vtlog "insmod $KoName"
--- a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
+++ b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
@@ -225,8 +225,12 @@ ventoy_check_dm_module() {

 ventoy_need_dm_patch() {
    if [ "$VTOY_LINUX_REMOUNT" != "01" ]; then
+        if $GREP -q 'VTOY_LINUX_REMOUNT=1' /proc/cmdline; then
+            :
+        else
            $BUSYBOX_PATH/false; return
        fi
+    fi

    if $GREP -q 'device-mapper' /proc/devices; then
        :
@@ -346,10 +350,12 @@ ventoy_dm_patch() {
    fi
    
    #step1: modify vermagic/mod crc/relocation
+    vtlog "$VTOY_PATH/tool/vtoykmod -u $VTOY_PATH/tool/$vtKoName $VTOY_PATH/$vtModName $vtDebug"
    $VTOY_PATH/tool/vtoykmod -u $VTOY_PATH/tool/$vtKoName $VTOY_PATH/$vtModName $vtDebug
    
    #step2: fill parameters
    vtPgsize=$($VTOY_PATH/tool/vtoyksym -p)
+    vtlog "$VTOY_PATH/tool/vtoykmod -f $VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtDebug"
    $VTOY_PATH/tool/vtoykmod -f $VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtDebug

    $BUSYBOX_PATH/insmod $VTOY_PATH/tool/$vtKoName
--- a/IMG/cpio/ventoy/loop/easyos/ventoy-disk.sh
+++ b/IMG/cpio/ventoy/loop/easyos/ventoy-disk.sh
@@ -27,8 +27,8 @@ vtlog "####### $0 $* ########"

 VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH

-$BUSYBOX_PATH/insmod $VTOY_PATH/modules/dax.ko
-$BUSYBOX_PATH/insmod $VTOY_PATH/modules/dm-mod.ko
+[ -f $VTOY_PATH/modules/dax.ko ] && $BUSYBOX_PATH/insmod $VTOY_PATH/modules/dax.ko
+[ -f $VTOY_PATH/modules/dm-mod.ko ] && $BUSYBOX_PATH/insmod $VTOY_PATH/modules/dm-mod.ko

 wait_for_usb_disk_ready

--- a/IMG/cpio/ventoy/ventoy_chain.sh
+++ b/IMG/cpio/ventoy/ventoy_chain.sh
@@ -94,6 +94,9 @@ ventoy_get_os_type() {
    elif $GREP -q '\.fc[0-9][0-9]\.' /proc/version; then
        echo 'rhel7'; return

+    elif $GREP -q 'euleros' /proc/version; then
+        echo 'rhel7'; return
+
    # SUSE
    elif $GREP -q 'SUSE' /proc/version; then
        echo 'suse'; return
--- a/INSTALL/EFI/BOOT/BOOTAA64.EFI
+++ b/INSTALL/EFI/BOOT/BOOTAA64.EFI
--- a/INSTALL/EFI/BOOT/BOOTMIPS.EFI
+++ b/INSTALL/EFI/BOOT/BOOTMIPS.EFI
--- a/INSTALL/EFI/BOOT/BOOTX64.EFI
+++ b/INSTALL/EFI/BOOT/BOOTX64.EFI
--- a/INSTALL/EFI/BOOT/MokManager.efi
+++ b/INSTALL/EFI/BOOT/MokManager.efi
--- a/INSTALL/EFI/BOOT/grubia32_real.efi
+++ b/INSTALL/EFI/BOOT/grubia32_real.efi
--- a/INSTALL/EFI/BOOT/grubx64_real.efi
+++ b/INSTALL/EFI/BOOT/grubx64_real.efi
--- a/INSTALL/EFI/BOOT/mmia32.efi
+++ b/INSTALL/EFI/BOOT/mmia32.efi
--- a/INSTALL/EFI/BOOT/mmx64.efi
+++ b/INSTALL/EFI/BOOT/mmx64.efi
--- a/INSTALL/Ventoy2Disk.exe
+++ b/INSTALL/Ventoy2Disk.exe
--- a/INSTALL/Ventoy2Disk_ARM.exe
+++ b/INSTALL/Ventoy2Disk_ARM.exe
--- a/INSTALL/Ventoy2Disk_ARM64.exe
+++ b/INSTALL/Ventoy2Disk_ARM64.exe
--- a/INSTALL/Ventoy2Disk_X64.exe
+++ b/INSTALL/Ventoy2Disk_X64.exe
--- a/INSTALL/VentoyGUI.aarch64
+++ b/INSTALL/VentoyGUI.aarch64
--- a/INSTALL/VentoyGUI.i386
+++ b/INSTALL/VentoyGUI.i386
--- a/INSTALL/VentoyGUI.mips64el
+++ b/INSTALL/VentoyGUI.mips64el
--- a/INSTALL/VentoyGUI.x86_64
+++ b/INSTALL/VentoyGUI.x86_64
--- a/INSTALL/grub/arm64-efi/command.lst
+++ b/INSTALL/grub/arm64-efi/command.lst
--- a/INSTALL/grub/arm64-efi/fwload.mod
+++ b/INSTALL/grub/arm64-efi/fwload.mod
--- a/INSTALL/grub/arm64-efi/moddep.lst
+++ b/INSTALL/grub/arm64-efi/moddep.lst
--- a/INSTALL/grub/arm64-efi/mouse.mod
+++ b/INSTALL/grub/arm64-efi/mouse.mod
--- a/INSTALL/grub/arm64-efi/normal.mod
+++ b/INSTALL/grub/arm64-efi/normal.mod
--- a/INSTALL/grub/arm64-efi/search_fs_file.mod
+++ b/INSTALL/grub/arm64-efi/search_fs_file.mod
--- a/INSTALL/grub/arm64-efi/search_fs_uuid.mod
+++ b/INSTALL/grub/arm64-efi/search_fs_uuid.mod
--- a/INSTALL/grub/arm64-efi/search_label.mod
+++ b/INSTALL/grub/arm64-efi/search_label.mod
--- a/INSTALL/grub/arm64-efi/smbios.mod
+++ b/INSTALL/grub/arm64-efi/smbios.mod
--- a/INSTALL/grub/arm64-efi/terminal.lst
+++ b/INSTALL/grub/arm64-efi/terminal.lst
--- a/INSTALL/grub/debug.cfg
+++ b/INSTALL/grub/debug.cfg
@@ -1,5 +1,6 @@

 source $prefix/power.cfg
+source $prefix/hwinfo.cfg
 source $prefix/keyboard.cfg

 submenu "Resolution Configuration" --class=debug_resolution --class=F5tool {
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -111,12 +111,18 @@ function ventoy_show_help {
 function get_os_type {
    set vtoy_os=Linux
    
+    if vt_str_begin "$vt_volume_id" "DLC Boot"; then
+        if [ -f (loop)/DLCBoot.exe ]; then
+            set vtoy_os=Windows
+        fi
+    else
        for file in "efi/microsoft/boot/bcd" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com" ; do        
            if vt_file_exist_nocase (loop)/$file; then        
                set vtoy_os=Windows            
                break
            fi
        done
+    fi

    if [ "$vtoy_os" = "Linux" ]; then
        if vt_strstr "$vt_system_id" "FreeBSD"; then
@@ -206,6 +212,15 @@ function distro_specify_wim_patch_phase2 {
    if [ -f (loop)/boot/boot.wim ]; then
        vt_windows_collect_wim_patch wim /boot/boot.wim
    fi
+
+    if vt_str_begin "$vt_volume_id" "DLC Boot"; then
+        for vwfile in "/DLC1/WinPE/W11x64.wim" "/DLC1/WinPE/W10x64.wim" "/DLC1/WinPE/W10x86.wim"; do
+            if [ -f (loop)/$vwfile ]; then
+                vt_windows_collect_wim_patch wim $vwfile
+            fi
+        done
+    fi
+    
 }


@@ -364,7 +379,8 @@ function distro_specify_initrd_file_phase2 {
        vt_linux_specify_initrd_file /initrd0.img
    elif [ -f (loop)/sysresccd/boot/i686/sysresccd.img ]; then
        vt_linux_specify_initrd_file /sysresccd/boot/i686/sysresccd.img
-    
+    elif [ -f (loop)/boot/full.cz ]; then
+        vt_linux_specify_initrd_file /boot/full.cz
    
    fi
 }
@@ -1037,7 +1053,11 @@ function legacy_windows_menu_func {

    if [ -n "$vtoy_chain_mem_addr" ]; then
        ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
+        if [ "$ventoy_compatible" = "NO" ]; then
+            linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+        else
            linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+        fi
        boot
    else
        echo "chain empty failed"
@@ -1281,7 +1301,7 @@ function iso_common_menuentry {
    unset vt_system_id
    unset vt_volume_id
    
-    vt_chosen_img_path vt_chosen_path vt_chosen_size
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name

    vt_parse_iso_volume "${vtoy_iso_part}${vt_chosen_path}" vt_system_id vt_volume_id vt_volume_space
    if [ $vt_volume_space -ne $vt_chosen_size ]; then        
@@ -1330,6 +1350,13 @@ function iso_common_menuentry {
                set vtMemDiskBoot=1
            fi
        fi
+        
+        #For iKuai8 (<64MB)
+        if [ $vt_chosen_size -le 67108864 ]; then
+            if vt_str_begin "$vt_chosen_name" "iKuai"; then
+                set vtMemDiskBoot=1
+            fi
+        fi
    fi
    vt_iso_vd_id_clear

@@ -1445,21 +1472,21 @@ function efi_common_menuentry {
        vt_vlnk_dst="${vtoy_iso_part}${vt_chosen_path}"
    fi
    
-    vt_concat_efi_iso "${vt_vlnk_dst}" vtoy_iso_buf
-    
    ventoy_debug_pause

    ventoy_cli_console
    
-    unset vtoy_dotefi_retry
-    chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} dotefi isoefi=on ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size}
-    boot
-    
-    if [ -n "$vtoy_dotefi_retry" ]; then
-        unset vtoy_dotefi_retry
+    #first try with chainload
+    set vtOldRoot=$root
+    set root=$vtoy_iso_part
    chainloader "${vt_vlnk_dst}"
    boot
-    fi
+
+    #retry with isoboot
+    set root=$vtOldRoot
+    vt_concat_efi_iso "${vt_vlnk_dst}" vtoy_iso_buf    
+    chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} dotefi isoefi=on ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size}
+    boot    

    ventoy_gui_console
 }
@@ -1640,7 +1667,9 @@ function ventoy_img_easyos {
    
    if [ -n "$vt_module_ver" ]; then        
        for mod in "kernel/drivers/md/dm-mod.ko" "kernel/drivers/dax/dax.ko"; do
+            if [ -e (easysfs)/lib/modules/$vt_module_ver/$mod ]; then
                vt_img_extra_initrd_append  (easysfs)/lib/modules/$vt_module_ver/$mod
+            fi
        done
    fi

@@ -2113,7 +2142,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################

-set VENTOY_VERSION="1.0.72"
+set VENTOY_VERSION="1.0.75"

 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -2267,6 +2296,11 @@ else
    terminal_output  gfxterm
 fi

+if [ "$grub_platform" = "efi" ]; then
+    set mouse_delta=4000
+    # terminal_input --append mouse
+fi
+
 if [ -n "$VTOY_DEFAULT_KBD_LAYOUT" ]; then
    set_keyboard_layout "$VTOY_DEFAULT_KBD_LAYOUT"
 fi
--- a/INSTALL/grub/hwinfo.cfg
+++ b/INSTALL/grub/hwinfo.cfg
@@ -0,0 +1,61 @@
+menuentry 'Hardware Information' --class=debug_hwinfo --class=F5tool {    
+    smbios -t 4 -s 0x10 --set=cpu_brand
+    
+    set system_vendor="-";
+    smbios -t 1 -s 0x04 --set=system_vendor;
+    set system_product="-";
+    smbios -t 1 -s 0x05 --set=system_product;
+    set system_version="-";
+    smbios -t 1 -s 0x06 --set=system_version;
+
+    set board_vendor="-";
+    smbios -t 2 -s 0x04 --set=board_vendor;
+    set board_product="-";
+    smbios -t 2 -s 0x05 --set=board_product;
+    set board_version="-";
+    smbios -t 2 -s 0x06 --set=board_version;
+
+    set bios_vendor="-";
+    smbios -t 0 -s 0x04 --set=bios_vendor;
+    set bios_version="-";
+    smbios -t 0 -s 0x05 --set=bios_ver;
+    set bios_date="-";
+    smbios -t 0 -s 0x08 --set=bios_date;
+    set bios_size="-";
+    smbios -t 0 -b 0x09 --set=bios_size;
+    
+    
+    echo "Platform                $grub_cpu-$grub_platform"    
+    if [ "$grub_platform" != "pc" ]; then
+        echo "UEFI Version            $grub_uefi_version"
+        if vt_check_secureboot_var; then
+            echo "Secure Boot             Enabled"
+        else
+            echo "Secure Boot             Disabled"
+        fi
+    fi
+    
+    echo ""    
+    echo "CPU Model               $cpu_brand"
+    echo "Physical RAM            $grub_total_ram MB"
+                                  
+    echo ""                       
+    echo "Manufacture             $system_vendor"
+    echo "Product Name            $system_product"
+    echo "Version                 $system_version"
+                                  
+    echo ""                       
+    echo "Board Manufacture       $board_vendor"
+    echo "Board Name              $board_product"
+    echo "Board Version           $board_version"
+                                  
+    echo ""                       
+    echo "BIOS Manufacture        $bios_vendor"
+    echo "BIOS Version            $bios_ver"
+    echo "BIOS Date               $bios_date"
+    echo "BIOS ROM Size           $bios_size"
+    
+    
+    echo -e "\n\n\npress ENTER to exit ..."
+    read vtInputKey
+}
--- a/INSTALL/grub/i386-efi/command.lst
+++ b/INSTALL/grub/i386-efi/command.lst
@@ -12,6 +12,8 @@
 *extract_syslinux_entries_source: syslinuxcfg
 *file: file
 *functional_test: functional_test
+*fwconnect: fwload
+*fwload: fwload
 *gettext: gettext
 *hashsum: hashsum
 *hdparm: hdparm
@@ -50,6 +52,7 @@
 *sha256sum: hashsum
 *sha512sum: hashsum
 *sleep: sleep
+*smbios: smbios
 *submenu: normal
 *syslinux_configfile: syslinuxcfg
 *syslinux_source: syslinuxcfg
--- a/INSTALL/grub/i386-efi/gfxterm_menu.mod
+++ b/INSTALL/grub/i386-efi/gfxterm_menu.mod
--- a/INSTALL/grub/i386-efi/moddep.lst
+++ b/INSTALL/grub/i386-efi/moddep.lst
@@ -26,7 +26,7 @@ sfs: fshelp
 reiserfs: fshelp
 part_sunpc:
 zstd:
-gfxmenu: trig video_colors gfxterm bitmap_scale font normal video bitmap
+gfxmenu: video_colors trig gfxterm bitmap_scale font normal video bitmap
 backtrace:
 jfs:
 help: extcmd normal
@@ -49,6 +49,7 @@ test_blockarg: extcmd normal
 true:
 affs: fshelp
 iso9660: fshelp
+smbios: extcmd
 exfat: fshelp
 setjmp_test: setjmp functional_test
 gfxterm: font video
@@ -120,7 +121,7 @@ ehci: cs5536 usb boot
 crypto:
 part_bsd: part_msdos
 cs5536:
-ventoy: fshelp ext2 elf btrfs font crypto gcry_md5 exfat udf div extcmd datetime normal video gcry_sha1 iso9660
+ventoy: ext2 fshelp elf btrfs font crypto gcry_md5 exfat udf div extcmd datetime normal video gcry_sha1 mmap iso9660
 gcry_sha512: crypto
 password: crypto normal
 fshelp:
@@ -181,6 +182,7 @@ usbtest: usb
 relocator: mmap
 acpi: extcmd mmap
 tga: bufio bitmap
+fwload: extcmd
 reboot:
 serial: extcmd terminfo
 zfscrypt: crypto pbkdf2 extcmd zfs gcry_sha1 gcry_rijndael
@@ -226,6 +228,7 @@ gcry_sha256: crypto
 ls: extcmd normal
 usbserial_common: serial usb
 ntfscomp: ntfs
+mouse:
 lzopio: crypto
 video_cirrus: video video_fb
 hello: extcmd
--- a/INSTALL/grub/i386-efi/normal.mod
+++ b/INSTALL/grub/i386-efi/normal.mod
--- a/INSTALL/grub/i386-efi/search_fs_file.mod
+++ b/INSTALL/grub/i386-efi/search_fs_file.mod
--- a/INSTALL/grub/i386-efi/search_fs_uuid.mod
+++ b/INSTALL/grub/i386-efi/search_fs_uuid.mod
--- a/INSTALL/grub/i386-efi/search_label.mod
+++ b/INSTALL/grub/i386-efi/search_label.mod
--- a/INSTALL/grub/i386-efi/smbios.mod
+++ b/INSTALL/grub/i386-efi/smbios.mod
--- a/INSTALL/grub/i386-efi/terminal.lst
+++ b/INSTALL/grub/i386-efi/terminal.lst
@@ -1,4 +1,5 @@
 iat_keyboard: at_keyboard
+imouse: mouse
 iserial: serial
 iserial_*: serial
 oaudio: morse
--- a/INSTALL/grub/i386-pc/command.lst
+++ b/INSTALL/grub/i386-pc/command.lst
@@ -54,6 +54,7 @@
 *sha256sum: hashsum
 *sha512sum: hashsum
 *sleep: sleep
+*smbios: smbios
 *submenu: normal
 *syslinux_configfile: syslinuxcfg
 *syslinux_source: syslinuxcfg
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
longpanda	025425f260	1.0.75 release	2022-05-31 19:22:02 +08:00
longpanda	b4120c4079	Update Super UEFIinSecureBoot Disk v3-2	2022-05-31 18:58:37 +08:00
longpanda	7f2f845a68	Auto use memdisk mode when booting iKuai OS.	2022-05-31 17:39:54 +08:00
longpanda	2cd22da8fb	Fix a bug when booting latest Alpine linux.	2022-05-31 16:42:41 +08:00
longpanda	7b70a5278a	Support programs loading for DLC Boot PE. (#1647 )	2022-05-31 14:11:24 +08:00
M	f8b1f98304	Update Polish translation (#1637 ) Fix typos and add new translations	2022-05-29 23:21:42 +08:00
longpanda	ddf0617d83	Fix the bug when booting ALT Linux in UEFI mode. (#1645 )	2022-05-28 22:33:36 +08:00
longpanda	9b14b418b4	Fix a bug when UEFI booting KaOS-2022.04-x86_64.iso	2022-05-20 23:22:37 +08:00
longpanda	fe137522ad	Fix a bug when boot in F2 browser mode if the computer has more than one disks with same size.	2022-05-08 11:41:12 +08:00
孟武.尼德霍格.龍	121d927367	Update Traditional Chinese Strings (#1615 )	2022-05-07 17:35:17 +08:00
longpanda	75f3e4c5ee	Add EDK debug info.	2022-05-06 14:44:10 +08:00
longpanda	fcf10deff3	Merge branch 'master' of https://github.com/ventoy/Ventoy	2022-05-05 19:12:15 +08:00
longpanda	4d4f958429	Fix the hardcoded dev/dm-0	2022-05-05 19:11:55 +08:00
B̅	e667233994	[l10n/jp] modify jp localization (#1608 ) - Corrected no-need spaces (e.g. spaces after punctuation). - Newly translated untranslated strings.	2022-05-04 16:55:05 +08:00
bovirus	57944520e5	Update italian language (#1598 ) @ventoy Please check and merge. Thanks.	2022-05-04 16:54:56 +08:00
Urajmal	4544e221d3	Updated Slovenian language (#1597 ) I did an update on Slovenian language, you can check out any problems.	2022-05-04 16:54:43 +08:00
longpanda	3263b64b8a	Reduce required low memory.	2022-05-03 19:13:29 +08:00
longpanda	69da3a59d8	Reduce the required low memory.	2022-05-03 18:41:16 +08:00
longpanda	75c6c7257f	Add debug info fix	2022-05-03 08:54:52 +08:00
longpanda	d4d8736620	Add debug info	2022-05-02 21:05:58 +08:00
longpanda	63f9331c31	Fix the bug when booting ATLAS Windows ISO.	2022-05-02 20:19:54 +08:00
longpanda	e1d161af4f	Fix a issue when booting easyos 3.4.3+	2022-05-02 18:21:30 +08:00
longpanda	9baa95359c	Fix a bug in menu tip plugin webpage of VentoyPlugson. (#1602 )	2022-04-30 14:52:00 +08:00
longpanda	5f3d7f3823	Fix the bug when booting linx iso (#1600 )	2022-04-29 19:57:04 +08:00
longpanda	3d1dc81fda	fix lvm issue	2022-04-29 01:13:04 +08:00
longpanda	3ebc610e7d	fix the lvm issue	2022-04-29 00:51:56 +08:00
longpanda	60588c8442	1.0.74 release	2022-04-28 22:27:52 +08:00
longpanda	c4c05fc073	Add support for EulerOS	2022-04-28 22:18:02 +08:00
longpanda	0984f5ba58	Fix a bug that Windows ISO in local disk can not install when boot through F2 browser mode in Legacy BIOS mode.	2022-04-28 22:07:30 +08:00
longpanda	fd0d335eb6	Fix a bug when install Ventoy if the USB already mounted at a path that contains space.	2022-04-27 10:25:44 +08:00
Mastiggia	12a284b543	Update French translation (#1589 )	2022-04-26 16:25:04 +08:00
longpanda	9e2e4ec0a9	Fix a bug for Linux GUI program when update from old release. (#1590 )	2022-04-26 14:49:07 +08:00
longpanda	480afee1a7	Update FUNDING.yml	2022-04-25 22:14:13 +08:00
longpanda	1305945bc0	Update FUNDING.yml	2022-04-25 22:09:28 +08:00
longpanda	2feb148982	--xdg improvement	2022-04-25 10:38:16 +08:00
longpanda	5eec535391	--xdg improvement	2022-04-24 20:14:26 +08:00
longpanda	33a562c273	support inst.ks=cdrom:/xxx for CentOS 7	2022-04-24 15:28:32 +08:00
longpanda	75517039a1	Firstly try to use chainload to boot .efi files.	2022-04-20 12:19:47 +08:00
longpanda	620229508b	Show the directory path in the return menu for TreeView mode and Browser mode.	2022-04-19 15:34:31 +08:00
Lyrx997	5553dd4fc4	Updated Italian language (#1574 )	2022-04-18 17:53:11 +08:00
longpanda	89addae48f	Fix the issue when booting Prime OS 2.1.0 (#1580 )	2022-04-18 13:43:38 +08:00
longpanda	682e8cdc42	Fixe the boot issue for Fedora when VTOY_LINUX_REMOUNT=1	2022-04-16 22:17:23 +08:00
Ida Bagus	1882cfcce2	Update indonesian (#1573 )	2022-04-12 10:32:52 +08:00
ShalokShalom	b8be46f0dc	Update README.md (#1570 )	2022-04-11 09:03:40 +08:00
longpanda	07693bf840	cc	2022-04-09 18:07:04 +08:00
longpanda	b4a059dd68	Add missing file	2022-04-08 17:21:36 +08:00
longpanda	858eec99a1	Fix the log/ini owner for VentoyGUI in linux.	2022-04-08 15:35:22 +08:00
VenusGirl❤	8180382fe1	Update languages.json (#1564 ) Korean Update	2022-04-07 15:12:09 +08:00
MELERIX	a5d9b1fd43	Update Spanish Translation (#1566 )	2022-04-07 09:04:05 +08:00
VenusGirl❤	8b76e06f6d	Update languages.json (#1565 ) Korean Update	2022-04-07 09:03:23 +08:00
VenusGirl❤	ecb133ed5e	Update languages.json (#1563 ) Korean Update	2022-04-06 22:06:33 +08:00
longpanda	da20eb5568	1.0.73 release	2022-04-06 20:34:33 +08:00
A1ive	2d76fa7303	fix bugs (#1561 ) * fix bug stopping iteration when --no-floppy is used * fix gfxmenu theme config handling bug	2022-04-06 20:09:45 +08:00
Tayfun Akkoyun	8fc8cc6867	Update languages.json (#1560 ) @ventoy I translated new adding lines(528,529) on Turkish Language	2022-04-06 19:13:54 +08:00
longpanda	132649c4e5	Add F5 Tools ---> Hardware Information menu	2022-04-06 19:12:59 +08:00
longpanda	c3c8100866	Merge branch 'master' of https://github.com/ventoy/Ventoy	2022-04-06 15:57:57 +08:00
longpanda	94e24e63c5	Add F5 Tools ---> Power ---> Reboot to EFI setup	2022-04-06 15:57:42 +08:00
reggie	c19cd649d8	Add all slovak and some czech translations (#1534 ) * Add slovak translations * Add missing czech translations * Fix two typos * Fix previous typo fix (im dumb, ok?) Co-authored-by: longpanda <59477474+ventoy@users.noreply.github.com>	2022-04-06 15:24:25 +08:00
VlatkoS	20914350fb	Updated and fixed typos in the Macedonian language (#1535 ) Updated and fixed typos in the Macedonian language	2022-04-06 15:19:49 +08:00
A1ive	8b411663cf	add support for uefi driver loading (#1552 )	2022-04-06 15:13:37 +08:00
longpanda	01292939d3	update	2022-04-05 19:19:06 +08:00
longpanda	dcc5889677	Prevent DLL search order hijacking for VentoyPlugson.exe and VentoyVlnk.exe	2022-04-05 17:37:08 +08:00
longpanda	04828df028	1. When click install button, if the USB stick already installed with Ventoy, then popup a dialog to require a YES text input to confirm. 2. Prevent DLL search order hijacking	2022-04-05 17:26:59 +08:00
longpanda	2f95139c77	Update vtoytool	2022-04-02 23:24:10 +08:00
longpanda	f2bb3667c4	Support specify menu_tip position and color per theme.	2022-04-01 20:23:56 +08:00
longpanda	791da48673	Update for efi mouse	2022-03-30 19:52:04 +08:00
longpanda	f683bcbd59	update for scroll menu text	2022-03-30 16:35:07 +08:00
A1ive	15b8b1f358	support scrolling menu entry's text (#1539 )	2022-03-29 22:50:11 +08:00
A1ive	a20592ecd1	Add mouse support for uefi (#1457 ) * fix gcc11 warnings * add mouse support for uefi	2022-03-29 22:49:37 +08:00