1.0.80 release

Adding Tamil Language translation to languages.json.

Signed-off-by: K.B.Dharun Krishna <kbdharunkrishna@gmail.com>

Signed-off-by: K.B.Dharun Krishna <kbdharunkrishna@gmail.com>

.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.75
+      placeholder: 1.0.80
     validations:
       required: true
   - type: dropdown
@@ -34,6 +34,16 @@ body:
         - No. I didn't try the latest release.
     validations:
       required: true
+  - type: dropdown
+    id: alternativemode
+    attributes:
+      label: Try alternative boot mode
+      description: Have you tried alternative boot mode? (wimboot mode for Windows/WinPE, grub2 mode for linux)
+      options:
+        - Yes. I have tried them, but the bug still exist.
+        - No. I didn't try these alternative boot modes.
+    validations:
+      required: true
   - type: dropdown
     id: bios
     attributes:

.github/ISSUE_TEMPLATE/success_image_report.yml

@@ -85,7 +85,7 @@ body:
   - type: input
     id: testenv
     attributes:
-      label: Test envrionment
+      label: Test environment
       description: The manufacturer/model and other details about your computer (or VM).
       placeholder: Lenovo Thinkpad T420 laptop
     validations:

DMPATCH/dmpatch.c

@@ -82,12 +82,34 @@ static volatile ko_param g_ko_param =
 
 #define vdebug(fmt, args...) if(kprintf) kprintf(KERN_ERR fmt, ##args)
 
-static int notrace dmpatch_replace_code(unsigned long addr, unsigned long size, int expect, const char *desc)
+static unsigned char *g_get_patch[MAX_PATCH] = { NULL };
+static unsigned char *g_put_patch[MAX_PATCH] = { NULL };
+
+static void notrace dmpatch_restore_code(unsigned char *opCode)
+{
+    unsigned long align;
+
+    if (opCode)
+    {
+        align = (unsigned long)opCode / g_ko_param.pgsize * g_ko_param.pgsize;
+        set_mem_rw(align, 1);
+        *opCode = 0x80;
+        set_mem_ro(align, 1);        
+    }
+}
+
+static int notrace dmpatch_replace_code
+(
+    unsigned long addr, 
+    unsigned long size, 
+    int expect, 
+    const char *desc, 
+    unsigned char **patch
+)
 {
     int i = 0;
     int cnt = 0;
     unsigned long align;
-    unsigned char *patch[MAX_PATCH];
     unsigned char *opCode = (unsigned char *)addr;
 
     vdebug("patch for %s 0x%lx %d\n", desc, addr, (int)size);
@@ -147,7 +169,7 @@ static int notrace dmpatch_init(void)
     reg_kprobe = (kprobe_reg_pf)g_ko_param.reg_kprobe_addr;
     unreg_kprobe = (kprobe_unreg_pf)g_ko_param.unreg_kprobe_addr;
 
-    r = dmpatch_replace_code(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 2, "dm_get_table_device");
+    r = dmpatch_replace_code(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 2, "dm_get_table_device", g_get_patch);
     if (r)
     {
         rc = -EINVAL;
@@ -155,7 +177,7 @@ static int notrace dmpatch_init(void)
     }
     vdebug("patch dm_get_table_device success\n");
 
-    r = dmpatch_replace_code(g_ko_param.sym_put_addr, g_ko_param.sym_put_size, 1, "dm_put_table_device");
+    r = dmpatch_replace_code(g_ko_param.sym_put_addr, g_ko_param.sym_put_size, 1, "dm_put_table_device", g_put_patch);
     if (r)
     {
         rc = -EINVAL;
@@ -174,7 +196,15 @@ out:
 
 static void notrace dmpatch_exit(void)
 {
+    int i = 0;
 
+    for (i = 0; i < MAX_PATCH; i++)
+    {
+        dmpatch_restore_code(g_get_patch[i]);
+        dmpatch_restore_code(g_put_patch[i]);
+    }
+
+    vdebug("dmpatch_exit success\n");
 }
 
 module_init(dmpatch_init);

DOC/BuildVentoyFromSource.txt

@@ -34,7 +34,7 @@
     https://codeload.github.com/libfuse/libfuse/zip/fuse-2.9.9           ===>  /home/Ventoy-master/ExFAT/libfuse-fuse-2.9.9.zip
     https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/aarch64-linux-gnu/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz           ===>  /opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz
     https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2020.08-1.tar.bz2 ===> /opt/aarch64--uclibc--stable-2020.08-1.tar.bz2
-    http://ftp.loongnix.org/toolchain/gcc/release/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz ===> /opt/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz
+    http://ftp.loongnix.cn/toolchain/gcc/release/mips/gcc7/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz ===> /opt/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz    
     https://github.com/ventoy/musl-cross-make/releases/download/latest/output.tar.bz2 ===> /opt/output.tar.bz2
 
 

EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.c

@@ -60,7 +60,7 @@ ventoy_grub_param_file_replace *g_file_replace_list = NULL;
 ventoy_efi_file_replace g_efi_file_replace;
 
 ventoy_grub_param_file_replace *g_img_replace_list = NULL;
-ventoy_efi_file_replace g_img_file_replace;
+ventoy_efi_file_replace g_img_file_replace[VTOY_MAX_CONF_REPLACE];
 
 CONST CHAR16 gIso9660EfiDriverPath[] = ISO9660_EFI_DRIVER_PATH;
 CONST CHAR16 gUdfEfiDriverPath[] = UDF_EFI_DRIVER_PATH;
@@ -829,6 +829,7 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle)
     ventoy_grub_param *pGrubParam = NULL;
     EFI_LOADED_IMAGE_PROTOCOL *pImageInfo = NULL;
     ventoy_chain_head *chain = NULL;
+    ventoy_grub_param_file_replace *replace = NULL;
 
     Status = gBS->HandleProtocol(ImageHandle, &gEfiLoadedImageProtocolGuid, (VOID **)&pImageInfo);
     if (EFI_ERROR(Status))
@@ -926,18 +927,27 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle)
         old_cnt > 3 ? g_file_replace_list->old_file_name[3] : ""
         );
 
-    g_img_replace_list = &pGrubParam->img_replace;
-    ventoy_proc_img_replace_name(g_img_replace_list);
-    old_cnt = g_img_replace_list->old_file_cnt;
-    debug("img replace: magic:0x%x virtid:%u name count:%u <%a> <%a> <%a> <%a>",
-        g_img_replace_list->magic,
-        g_img_replace_list->new_file_virtual_id,
-        old_cnt,
-        old_cnt > 0 ? g_img_replace_list->old_file_name[0] : "",
-        old_cnt > 1 ? g_img_replace_list->old_file_name[1] : "",
-        old_cnt > 2 ? g_img_replace_list->old_file_name[2] : "",
-        old_cnt > 3 ? g_img_replace_list->old_file_name[3] : ""
-        );
+    
+    for (i = 0; i < VTOY_MAX_CONF_REPLACE; i++)
+    {
+        replace = pGrubParam->img_replace + i;
+        if (replace->magic == GRUB_IMG_REPLACE_MAGIC)
+        {
+            ventoy_proc_img_replace_name(replace);
+            old_cnt = replace->old_file_cnt;
+            debug("img replace[%d]: magic:0x%x virtid:%u name count:%u <%a> <%a> <%a> <%a>",
+                  i, replace->magic,
+                  replace->new_file_virtual_id,
+                  old_cnt,
+                  old_cnt > 0 ? replace->old_file_name[0] : "",
+                  old_cnt > 1 ? replace->old_file_name[1] : "",
+                  old_cnt > 2 ? replace->old_file_name[2] : "",
+                  old_cnt > 3 ? replace->old_file_name[3] : ""
+                  );
+            g_img_replace_list = pGrubParam->img_replace;
+        }
+    }
+
     
     pPos = StrStr(pCmdLine, L"mem:");
     chain = (ventoy_chain_head *)StrHexToUintn(pPos + 4);
@@ -1178,8 +1188,7 @@ EFI_STATUS EFIAPI ventoy_boot(IN EFI_HANDLE ImageHandle)
                 gST->ConIn->Reset(gST->ConIn, FALSE);
             }
             
-            if ((g_file_replace_list && g_file_replace_list->magic == GRUB_FILE_REPLACE_MAGIC) ||
-                (g_img_replace_list && g_img_replace_list->magic == GRUB_IMG_REPLACE_MAGIC))
+            if ((g_file_replace_list && g_file_replace_list->magic == GRUB_FILE_REPLACE_MAGIC) || g_img_replace_list)
             {
                 ventoy_wrapper_push_openvolume(pFile->OpenVolume);
                 pFile->OpenVolume = ventoy_wrapper_open_volume;

EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.h

@@ -244,6 +244,7 @@ typedef int (*grub_env_printf_pf)(const char *fmt, ...);
 
 #pragma pack(1)
 
+#define VTOY_MAX_CONF_REPLACE    2
 #define GRUB_FILE_REPLACE_MAGIC  0x1258BEEF
 #define GRUB_IMG_REPLACE_MAGIC   0x1259BEEF
 
@@ -270,7 +271,7 @@ typedef struct ventoy_grub_param
     grub_env_get_pf grub_env_get;
     grub_env_set_pf grub_env_set;
     ventoy_grub_param_file_replace file_replace;
-    ventoy_grub_param_file_replace img_replace;
+    ventoy_grub_param_file_replace img_replace[VTOY_MAX_CONF_REPLACE];
     grub_env_printf_pf grub_env_printf;    
 }ventoy_grub_param;
 
@@ -400,7 +401,7 @@ extern ventoy_virt_chunk *g_virt_chunk;
 extern UINT32 g_virt_chunk_num;
 extern vtoy_block_data gBlockData;
 extern ventoy_efi_file_replace g_efi_file_replace;
-extern ventoy_efi_file_replace g_img_file_replace;
+extern ventoy_efi_file_replace g_img_file_replace[VTOY_MAX_CONF_REPLACE];
 extern ventoy_sector_flag *g_sector_flag;
 extern UINT32 g_sector_flag_num;
 extern BOOLEAN gMemdiskMode;

EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/VentoyProtocol.c

@@ -37,9 +37,6 @@
 #include <Protocol/DriverBinding.h>
 #include <Ventoy.h>
 
-#define ASSIGN_REPLACE(This, replace) \
-    replace = (This->FlushEx == ventoy_wrapper_file_flush_ex) ? &g_efi_file_replace : &g_img_file_replace
-
 UINT8 *g_iso_data_buf = NULL;
 UINTN g_iso_buf_size = 0;
 BOOLEAN gMemdiskMode = FALSE;
@@ -1251,13 +1248,96 @@ ventoy_wrapper_file_flush_ex(EFI_FILE_HANDLE This, EFI_FILE_IO_TOKEN *Token)
 
 /* Ex version */
 STATIC EFI_STATUS EFIAPI
-ventoy_wrapper_file_flush_ex_img(EFI_FILE_HANDLE This, EFI_FILE_IO_TOKEN *Token)
+ventoy_wrapper_file_flush_ex_img0(EFI_FILE_HANDLE This, EFI_FILE_IO_TOKEN *Token)
+{
+    (VOID)This;
+    (VOID)Token;
+	return EFI_SUCCESS;
+}
+/* Ex version */
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_flush_ex_img1(EFI_FILE_HANDLE This, EFI_FILE_IO_TOKEN *Token)
 {
     (VOID)This;
     (VOID)Token;
 	return EFI_SUCCESS;
 }
 
+#define DEF_WRAP_FUNC(n) \
+STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_flush_ex_img#n(EFI_FILE_HANDLE This, EFI_FILE_IO_TOKEN *Token) \
+{\
+    (VOID)This;\
+    (VOID)Token;\
+	return EFI_SUCCESS;\
+}
+
+#define ITEM_WRAP_FUNC(n) ventoy_wrapper_file_flush_ex_img#n
+
+#if (VTOY_MAX_CONF_REPLACE > 2)
+DEF_WRAP_FUNC(2);
+#endif
+#if (VTOY_MAX_CONF_REPLACE > 3)
+DEF_WRAP_FUNC(3);
+#endif
+#if (VTOY_MAX_CONF_REPLACE > 4)
+DEF_WRAP_FUNC(4);
+#endif
+#if (VTOY_MAX_CONF_REPLACE > 5)
+DEF_WRAP_FUNC(5);
+#endif
+#if (VTOY_MAX_CONF_REPLACE > 6)
+DEF_WRAP_FUNC(6);
+#endif
+#if (VTOY_MAX_CONF_REPLACE > 7)
+DEF_WRAP_FUNC(7);
+#endif
+#if (VTOY_MAX_CONF_REPLACE > 8)
+#error "VTOY_MAX_CONF_REPLACE overflow"
+#endif
+
+static EFI_FILE_FLUSH_EX g_img_flush_func[VTOY_MAX_CONF_REPLACE] = 
+{
+    ventoy_wrapper_file_flush_ex_img0,
+    ventoy_wrapper_file_flush_ex_img1,
+#if (VTOY_MAX_CONF_REPLACE > 2)
+    ITEM_WRAP_FUNC(2),
+#endif
+#if (VTOY_MAX_CONF_REPLACE > 3)
+    ITEM_WRAP_FUNC(3),
+#endif
+#if (VTOY_MAX_CONF_REPLACE > 4)
+    ITEM_WRAP_FUNC(4),
+#endif
+#if (VTOY_MAX_CONF_REPLACE > 5)
+    ITEM_WRAP_FUNC(5),
+#endif
+#if (VTOY_MAX_CONF_REPLACE > 6)
+    ITEM_WRAP_FUNC(6),
+#endif
+#if (VTOY_MAX_CONF_REPLACE > 7)
+    ITEM_WRAP_FUNC(7),
+#endif
+};
+
+STATIC ventoy_efi_file_replace *ventoy_wrapper_get_replace(EFI_FILE_HANDLE This)
+{
+    UINTN i;
+
+    if (This->FlushEx == ventoy_wrapper_file_flush_ex)
+    {
+        return &g_efi_file_replace;
+    }
+
+    for (i = 0; i < VTOY_MAX_CONF_REPLACE; i++)
+    {
+        if (This->FlushEx == g_img_flush_func[i])
+        {
+            return g_img_file_replace + i;
+        }
+    }
+    
+    return NULL;
+}
 
 STATIC EFI_STATUS EFIAPI
 ventoy_wrapper_file_write(EFI_FILE_HANDLE This, UINTN *Len, VOID *Data)
@@ -1288,7 +1368,7 @@ ventoy_wrapper_file_set_pos(EFI_FILE_HANDLE This, UINT64 Position)
 {
     ventoy_efi_file_replace *replace = NULL;
 
-    ASSIGN_REPLACE(This, replace);
+    replace = ventoy_wrapper_get_replace(This);
     
     if (Position <= replace->FileSizeBytes)
     {
@@ -1307,7 +1387,7 @@ ventoy_wrapper_file_get_pos(EFI_FILE_HANDLE This, UINT64 *Position)
 {
     ventoy_efi_file_replace *replace = NULL;
 
-    ASSIGN_REPLACE(This, replace);
+    replace = ventoy_wrapper_get_replace(This);
 
     *Position = replace->CurPos;
 
@@ -1321,7 +1401,7 @@ ventoy_wrapper_file_get_info(EFI_FILE_HANDLE This, EFI_GUID *Type, UINTN *Len, V
     EFI_FILE_INFO *Info = (EFI_FILE_INFO *) Data;
     ventoy_efi_file_replace *replace = NULL;
 
-    ASSIGN_REPLACE(This, replace);
+    replace = ventoy_wrapper_get_replace(This);
 
     debug("ventoy_wrapper_file_get_info ... %u", *Len);
 
@@ -1356,7 +1436,7 @@ ventoy_wrapper_file_read(EFI_FILE_HANDLE This, UINTN *Len, VOID *Data)
     UINTN ReadLen = *Len;
     ventoy_efi_file_replace *replace = NULL;
 
-    ASSIGN_REPLACE(This, replace);
+    replace = ventoy_wrapper_get_replace(This);
     
     debug("ventoy_wrapper_file_read ... %u", *Len);
 
@@ -1382,7 +1462,7 @@ ventoy_wrapper_file_read_ex(IN EFI_FILE_PROTOCOL *This, IN OUT EFI_FILE_IO_TOKEN
 	return ventoy_wrapper_file_read(This, &(Token->BufferSize), Token->Buffer);
 }
 
-STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_procotol(EFI_FILE_PROTOCOL *File, BOOLEAN Img)
+STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_procotol(EFI_FILE_PROTOCOL *File, BOOLEAN Img, UINTN Index)
 {
     File->Revision    = EFI_FILE_PROTOCOL_REVISION2;
     File->Open        = ventoy_wrapper_fs_open;
@@ -1398,7 +1478,15 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_procotol(EFI_FILE_PROTOCOL *File, B
     File->OpenEx      = ventoy_wrapper_file_open_ex;
     File->ReadEx      = ventoy_wrapper_file_read_ex;
     File->WriteEx     = ventoy_wrapper_file_write_ex;
-    File->FlushEx     = Img ? ventoy_wrapper_file_flush_ex_img : ventoy_wrapper_file_flush_ex;
+
+    if (Img)
+    {
+        File->FlushEx = g_img_flush_func[Index];
+    }
+    else
+    {
+        File->FlushEx = ventoy_wrapper_file_flush_ex;
+    }
 
     return EFI_SUCCESS;
 }
@@ -1419,6 +1507,7 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
     CHAR8 TmpName[256];
     CHAR8 OldName[256];
     ventoy_virt_chunk *virt = NULL;
+    ventoy_grub_param_file_replace *replace = NULL;
 
     debug("## ventoy_wrapper_file_open <%s> ", Name);
 
@@ -1449,7 +1538,7 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
             {
                 g_original_fclose(*New);
                 *New = &g_efi_file_replace.WrapperHandle;
-                ventoy_wrapper_file_procotol(*New, FALSE);
+                ventoy_wrapper_file_procotol(*New, FALSE, 0);
 
                 virt = g_virt_chunk + g_file_replace_list->new_file_virtual_id;
 
@@ -1475,15 +1564,18 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
         }
     }
 
-
-
-    if (g_img_replace_list && g_img_replace_list->magic == GRUB_IMG_REPLACE_MAGIC &&
-        g_img_replace_list->new_file_virtual_id < g_virt_chunk_num)
+    for (i = 0; g_img_replace_list && i < VTOY_MAX_CONF_REPLACE; i++)
     {
-        AsciiSPrint(TmpName, sizeof(TmpName), "%s", Name);
-        for (j = 0; j < g_img_replace_list->old_file_cnt; j++)
+        replace = g_img_replace_list + i;
+        if (replace->magic != GRUB_IMG_REPLACE_MAGIC || replace->new_file_virtual_id >= g_virt_chunk_num)
         {
-            AsciiStrCpyS(OldName, sizeof(OldName), g_img_replace_list[i].old_file_name[j]);
+            continue;
+        }
+
+        AsciiSPrint(TmpName, sizeof(TmpName), "%s", Name);
+        for (j = 0; j < replace->old_file_cnt; j++)
+        {
+            AsciiStrCpyS(OldName, sizeof(OldName), replace->old_file_name[j]);
             if ((0 == AsciiStrCmp(OldName, TmpName)) ||
                  (AsciiStrnCmp(OldName, "\\loader\\entries\\", 16) == 0 && 
                   AsciiStrCmp(OldName + 16, TmpName) == 0
@@ -1491,31 +1583,31 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
                 )
             {
                 g_original_fclose(*New);
-                *New = &g_img_file_replace.WrapperHandle;
-                ventoy_wrapper_file_procotol(*New, TRUE);
+                *New = &(g_img_file_replace[i].WrapperHandle);
+                ventoy_wrapper_file_procotol(*New, TRUE, i);
 
-                virt = g_virt_chunk + g_img_replace_list->new_file_virtual_id;
+                virt = g_virt_chunk + replace->new_file_virtual_id;
 
                 Sectors = (virt->mem_sector_end - virt->mem_sector_start) + (virt->remap_sector_end - virt->remap_sector_start);
                 
-                g_img_file_replace.BlockIoSectorStart = virt->mem_sector_start;
-                g_img_file_replace.FileSizeBytes = Sectors * 2048;
+                g_img_file_replace[i].BlockIoSectorStart = virt->mem_sector_start;
+                g_img_file_replace[i].FileSizeBytes = Sectors * 2048;
 
                 if (gDebugPrint)
                 {
                     debug("## ventoy_wrapper_file_open2 <%s> BlockStart:%lu Sectors:%lu Bytes:%lu", Name,
-                        g_img_file_replace.BlockIoSectorStart, Sectors, Sectors * 2048);
+                        g_img_file_replace[i].BlockIoSectorStart, Sectors, Sectors * 2048);
                     sleep(3);
                 }
                 
                 return Status;
             }
         }
+    }
 
-        if (StrCmp(Name, L"\\loader\\entries") == 0)
-        {
-            (*New)->Open = ventoy_wrapper_file_open;
-        }
+    if (g_img_replace_list && StrCmp(Name, L"\\loader\\entries") == 0)
+    {
+        (*New)->Open = ventoy_wrapper_file_open;
     }
 
     return Status;

EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyUtil.h

@@ -28,6 +28,8 @@ typedef int (*grub_env_set_pf)(const char *name, const char *val);
 typedef const char * (*grub_env_get_pf)(const char *name);
 typedef int (*grub_env_printf_pf)(const char *fmt, ...);
 
+#define VTOY_MAX_CONF_REPLACE    2
+
 typedef struct ventoy_grub_param_file_replace
 {
     UINT32 magic;
@@ -41,7 +43,7 @@ typedef struct ventoy_grub_param
     grub_env_get_pf grub_env_get;
     grub_env_set_pf grub_env_set;
     ventoy_grub_param_file_replace file_replace;
-    ventoy_grub_param_file_replace img_replace;
+    ventoy_grub_param_file_replace img_replace[VTOY_MAX_CONF_REPLACE];
     grub_env_printf_pf grub_env_printf;    
 }ventoy_grub_param;
 #pragma pack()

GRUB2/MOD_SRC/grub-2.04/grub-core/commands/test.c

@@ -229,6 +229,13 @@ test_parse (char **args, int *argn, int argc)
 	      (*argn) += 3;
 	      continue;
 	    }
+      if (grub_strcmp (args[*argn + 1], "-EQ") == 0)
+	    {
+	      update_val (grub_strtoull (args[*argn], 0, 0)
+			  == grub_strtoull (args[*argn + 2], 0, 0), &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
 
 	  if (grub_strcmp (args[*argn + 1], "-ge") == 0)
 	    {
@@ -237,6 +244,13 @@ test_parse (char **args, int *argn, int argc)
 	      (*argn) += 3;
 	      continue;
 	    }
+	  if (grub_strcmp (args[*argn + 1], "-GE") == 0)
+	    {
+	      update_val (grub_strtoull (args[*argn], 0, 0)
+			  >= grub_strtoull (args[*argn + 2], 0, 0), &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
 
 	  if (grub_strcmp (args[*argn + 1], "-gt") == 0)
 	    {
@@ -245,6 +259,13 @@ test_parse (char **args, int *argn, int argc)
 	      (*argn) += 3;
 	      continue;
 	    }
+	  if (grub_strcmp (args[*argn + 1], "-GT") == 0)
+	    {
+	      update_val (grub_strtoull (args[*argn], 0, 0)
+			  > grub_strtoull (args[*argn + 2], 0, 0), &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
 
 	  if (grub_strcmp (args[*argn + 1], "-le") == 0)
 	    {
@@ -253,6 +274,13 @@ test_parse (char **args, int *argn, int argc)
 	      (*argn) += 3;
 	      continue;
 	    }
+	  if (grub_strcmp (args[*argn + 1], "-LE") == 0)
+	    {
+	      update_val (grub_strtoull (args[*argn], 0, 0)
+		      <= grub_strtoull (args[*argn + 2], 0, 0), &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
 
 	  if (grub_strcmp (args[*argn + 1], "-lt") == 0)
 	    {
@@ -261,6 +289,13 @@ test_parse (char **args, int *argn, int argc)
 	      (*argn) += 3;
 	      continue;
 	    }
+	  if (grub_strcmp (args[*argn + 1], "-LT") == 0)
+	    {
+	      update_val (grub_strtoull (args[*argn], 0, 0)
+			  < grub_strtoull (args[*argn + 2], 0, 0), &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
 
 	  if (grub_strcmp (args[*argn + 1], "-ne") == 0)
 	    {
@@ -269,6 +304,13 @@ test_parse (char **args, int *argn, int argc)
 	      (*argn) += 3;
 	      continue;
 	    }
+	  if (grub_strcmp (args[*argn + 1], "-NE") == 0)
+	    {
+	      update_val (grub_strtoull (args[*argn], 0, 0)
+			  != grub_strtoull (args[*argn + 2], 0, 0), &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
 
 	  /* GRUB extension: compare numbers skipping prefixes.
 	     Useful for comparing versions. E.g. vmlinuz-2 -plt vmlinuz-11. */

GRUB2/MOD_SRC/grub-2.04/grub-core/fs/zfs/zfs_lz4.c

@@ -0,0 +1,285 @@
+/*
+ * LZ4 - Fast LZ compression algorithm
+ * Header File
+ * Copyright (C) 2011-2013, Yann Collet.
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * You can contact the author at :
+ * - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
+ * - LZ4 source repository : http://code.google.com/p/lz4/
+ */
+
+#include <grub/err.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/types.h>
+
+int LZ4_uncompress_unknownOutputSize(const char *source, char *dest,
+					    int isize, int maxOutputSize);
+
+/*
+ * CPU Feature Detection
+ */
+
+/* 32 or 64 bits ? */
+#if (GRUB_CPU_SIZEOF_VOID_P == 8)
+#define	LZ4_ARCH64	1
+#else
+#define	LZ4_ARCH64	0
+#endif
+
+/*
+ * Compiler Options
+ */
+
+
+#define	GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+
+#if (GCC_VERSION >= 302) || (defined (__INTEL_COMPILER) && __INTEL_COMPILER >= 800) || defined(__clang__)
+#define	expect(expr, value)    (__builtin_expect((expr), (value)))
+#else
+#define	expect(expr, value)    (expr)
+#endif
+
+#define	likely(expr)	expect((expr) != 0, 1)
+#define	unlikely(expr)	expect((expr) != 0, 0)
+
+/* Basic types */
+#define	BYTE	grub_uint8_t
+#define	U16	grub_uint16_t
+#define	U32	grub_uint32_t
+#define	S32	grub_int32_t
+#define	U64	grub_uint64_t
+
+typedef struct _U16_S {
+	U16 v;
+} GRUB_PACKED U16_S;
+typedef struct _U32_S {
+	U32 v;
+} GRUB_PACKED U32_S;
+typedef struct _U64_S {
+	U64 v;
+} GRUB_PACKED U64_S;
+
+#define	A64(x)	(((U64_S *)(x))->v)
+#define	A32(x)	(((U32_S *)(x))->v)
+#define	A16(x)	(((U16_S *)(x))->v)
+
+/*
+ * Constants
+ */
+#define	MINMATCH 4
+
+#define	COPYLENGTH 8
+#define	LASTLITERALS 5
+
+#define	ML_BITS 4
+#define	ML_MASK ((1U<<ML_BITS)-1)
+#define	RUN_BITS (8-ML_BITS)
+#define	RUN_MASK ((1U<<RUN_BITS)-1)
+
+/*
+ * Architecture-specific macros
+ */
+#if LZ4_ARCH64
+#define	STEPSIZE 8
+#define	UARCH U64
+#define	AARCH A64
+#define	LZ4_COPYSTEP(s, d)	A64(d) = A64(s); d += 8; s += 8;
+#define	LZ4_COPYPACKET(s, d)	LZ4_COPYSTEP(s, d)
+#define	LZ4_SECURECOPY(s, d, e)	if (d < e) LZ4_WILDCOPY(s, d, e)
+#define	HTYPE U32
+#define	INITBASE(base)		const BYTE* const base = ip
+#else
+#define	STEPSIZE 4
+#define	UARCH U32
+#define	AARCH A32
+#define	LZ4_COPYSTEP(s, d)	A32(d) = A32(s); d += 4; s += 4;
+#define	LZ4_COPYPACKET(s, d)	LZ4_COPYSTEP(s, d); LZ4_COPYSTEP(s, d);
+#define	LZ4_SECURECOPY		LZ4_WILDCOPY
+#define	HTYPE const BYTE*
+#define	INITBASE(base)		const int base = 0
+#endif
+
+#define	LZ4_READ_LITTLEENDIAN_16(d, s, p) { d = (s) - grub_le_to_cpu16 (A16 (p)); }
+#define	LZ4_WRITE_LITTLEENDIAN_16(p, v)  { A16(p) = grub_cpu_to_le16 (v); p += 2; }
+
+/* Macros */
+#define	LZ4_WILDCOPY(s, d, e) do { LZ4_COPYPACKET(s, d) } while (d < e);
+
+/* Decompression functions */
+grub_err_t
+lz4_decompress(void *s_start, void *d_start, grub_size_t s_len, grub_size_t d_len);
+
+grub_err_t
+lz4_decompress(void *s_start, void *d_start, grub_size_t s_len, grub_size_t d_len)
+{
+	const BYTE *src = s_start;
+	U32 bufsiz = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) |
+	    src[3];
+
+	/* invalid compressed buffer size encoded at start */
+	if (bufsiz + 4 > s_len)
+		return grub_error(GRUB_ERR_BAD_FS,"lz4 decompression failed.");
+
+	/*
+	 * Returns 0 on success (decompression function returned non-negative)
+	 * and appropriate error on failure (decompression function returned negative).
+	 */
+	return (LZ4_uncompress_unknownOutputSize((char*)s_start + 4, d_start, bufsiz,
+	    d_len) < 0)?grub_error(GRUB_ERR_BAD_FS,"lz4 decompression failed."):0;
+}
+
+int
+LZ4_uncompress_unknownOutputSize(const char *source,
+    char *dest, int isize, int maxOutputSize)
+{
+	/* Local Variables */
+	const BYTE * ip = (const BYTE *) source;
+	const BYTE *const iend = ip + isize;
+	const BYTE * ref;
+
+	BYTE * op = (BYTE *) dest;
+	BYTE *const oend = op + maxOutputSize;
+	BYTE *cpy;
+
+	grub_size_t dec[] = { 0, 3, 2, 3, 0, 0, 0, 0 };
+
+	/* Main Loop */
+	while (ip < iend) {
+		BYTE token;
+		int length;
+
+		/* get runlength */
+		token = *ip++;
+		if ((length = (token >> ML_BITS)) == RUN_MASK) {
+			int s = 255;
+			while ((ip < iend) && (s == 255)) {
+				s = *ip++;
+				length += s;
+			}
+		}
+		/* copy literals */
+		if ((grub_addr_t) length > ~(grub_addr_t)op)
+		  goto _output_error;
+		cpy = op + length;
+		if ((cpy > oend - COPYLENGTH) ||
+		    (ip + length > iend - COPYLENGTH)) {
+			if (cpy > oend)
+				/*
+				 * Error: request to write beyond destination
+				 * buffer.
+				 */
+				goto _output_error;
+			if (ip + length > iend)
+				/*
+				 * Error : request to read beyond source
+				 * buffer.
+				 */
+				goto _output_error;
+			grub_memcpy(op, ip, length);
+			op += length;
+			ip += length;
+			if (ip < iend)
+				/* Error : LZ4 format violation */
+				goto _output_error;
+			/* Necessarily EOF, due to parsing restrictions. */
+			break;
+		}
+		LZ4_WILDCOPY(ip, op, cpy);
+		ip -= (op - cpy);
+		op = cpy;
+
+		/* get offset */
+		LZ4_READ_LITTLEENDIAN_16(ref, cpy, ip);
+		ip += 2;
+		if (ref < (BYTE * const) dest)
+			/*
+			 * Error: offset creates reference outside of
+			 * destination buffer.
+			 */
+			goto _output_error;
+
+		/* get matchlength */
+		if ((length = (token & ML_MASK)) == ML_MASK) {
+			while (ip < iend) {
+				int s = *ip++;
+				length += s;
+				if (s == 255)
+					continue;
+				break;
+			}
+		}
+		/* copy repeated sequence */
+		if unlikely(op - ref < STEPSIZE) {
+#if LZ4_ARCH64
+			grub_size_t dec2table[] = { 0, 0, 0, -1, 0, 1, 2, 3 };
+			grub_size_t dec2 = dec2table[op - ref];
+#else
+			const int dec2 = 0;
+#endif
+			*op++ = *ref++;
+			*op++ = *ref++;
+			*op++ = *ref++;
+			*op++ = *ref++;
+			ref -= dec[op - ref];
+			A32(op) = A32(ref);
+			op += STEPSIZE - 4;
+			ref -= dec2;
+		} else {
+			LZ4_COPYSTEP(ref, op);
+		}
+		cpy = op + length - (STEPSIZE - 4);
+		if (cpy > oend - COPYLENGTH) {
+			if (cpy > oend)
+				/*
+				 * Error: request to write outside of
+				 * destination buffer.
+				 */
+				goto _output_error;
+			LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH));
+			while (op < cpy)
+				*op++ = *ref++;
+			op = cpy;
+			if (op == oend)
+				/*
+				 * Check EOF (should never happen, since last
+				 * 5 bytes are supposed to be literals).
+				 */
+				break;
+			continue;
+		}
+		LZ4_SECURECOPY(ref, op, cpy);
+		op = cpy;	/* correction */
+	}
+
+	/* end of decoding */
+	return (int)(((char *)op) - dest);
+
+	/* write overflow error detected */
+	_output_error:
+	return (int)(-(((char *)ip) - source));
+}

GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu.c

@@ -939,24 +939,28 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
             goto refresh;
             
         case (GRUB_TERM_CTRL | 'i'):
+        case 'i':
             menu_fini ();
             g_ventoy_iso_raw = 1 - g_ventoy_iso_raw;
             g_ventoy_menu_refresh = 1;
             goto refresh;
             
         case (GRUB_TERM_CTRL | 'r'):
+        case 'r':
             menu_fini ();
             g_ventoy_grub2_mode = 1 - g_ventoy_grub2_mode;
             g_ventoy_menu_refresh = 1;
             goto refresh;
             
         case (GRUB_TERM_CTRL | 'w'):
+        case 'w':
             menu_fini ();
             g_ventoy_wimboot_mode = 1 - g_ventoy_wimboot_mode;
             g_ventoy_menu_refresh = 1;
             goto refresh;
             
         case (GRUB_TERM_CTRL | 'u'):
+        case 'u':
             menu_fini ();
             g_ventoy_iso_uefi_drv = 1 - g_ventoy_iso_uefi_drv;
             g_ventoy_menu_refresh = 1;

GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c

@@ -38,6 +38,7 @@
 #include <grub/memory.h>
 #ifdef GRUB_MACHINE_EFI
 #include <grub/efi/efi.h>
+#include <grub/efi/memory.h>
 #endif
 #include <grub/ventoy.h>
 #include "ventoy_def.h"
@@ -75,7 +76,44 @@ void ventoy_str_toupper(char *str)
     }
 }
 
+char *ventoy_str_last(char *str, char ch)
+{
+    char *pos = NULL;
+    char *last = NULL;
 
+    if (!str)
+    {
+        return NULL;
+    }
+
+    for (pos = str; *pos; pos++)
+    {
+        if (*pos == ch)
+        {
+            last = pos;
+        }
+    }
+
+    return last;
+}
+
+int ventoy_str_all_digit(const char *str)
+{
+    if (NULL == str || 0 == *str)
+    {
+        return 0;
+    }
+
+    while (*str)
+    {
+        if (*str < '0' || *str > '9')
+        {
+            return 0;
+        }
+    }
+
+    return 1;
+}
 
 int ventoy_strcmp(const char *pattern, const char *str)
 {
@@ -135,6 +173,22 @@ int ventoy_is_efi_os(void)
     return g_efi_os;
 }
 
+void * ventoy_alloc_chain(grub_size_t size)
+{
+    void *p = NULL;
+
+    p = grub_malloc(size);
+#ifdef GRUB_MACHINE_EFI
+    if (!p)
+    {
+        p = grub_efi_allocate_any_pages(GRUB_EFI_BYTES_TO_PAGES(size));
+    }
+#endif
+
+    return p;
+}
+
+
 static int ventoy_arch_mode_init(void)
 {
     #ifdef GRUB_MACHINE_EFI

GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_browser.c

@@ -171,6 +171,11 @@ static int ventoy_browser_iterate_partition(struct grub_disk *disk, const grub_p
 
     fs->fs_label(dev, &Label);
 
+    if (ventoy_check_file_exist("(%s)/.ventoyignore", partname))
+    {
+        return 0;
+    }
+
     if (g_tree_view_menu_style == 0)
     {
         grub_snprintf(title, sizeof(title), "%-10s (%s,%s%d) [%s] %s %s", 
@@ -311,6 +316,25 @@ static int ventoy_browser_valid_filename(const char *filename, int len, int *typ
     return 1;
 }
 
+static int ventoy_browser_check_ignore(const char *device, const char *root, const char *dir)
+{
+    grub_file_t file;
+    char fullpath[1024] = {0};
+
+    grub_snprintf(fullpath, 1023, "(%s)%s/%s/.ventoyignore", device, root, dir);
+    file = grub_file_open(fullpath, GRUB_FILE_TYPE_NONE);
+    if (!file)
+    {
+        grub_errno = 0;
+        return 0;
+    }
+    else
+    {
+        grub_file_close(file);
+        return 1;
+    }
+}
+
 static int ventoy_browser_iterate_dir(const char *filename, const struct grub_dirhook_info *info, void *data)
 {
     int type;
@@ -328,6 +352,11 @@ static int ventoy_browser_iterate_dir(const char *filename, const struct grub_di
             return 0;
         }
 
+        if (ventoy_browser_check_ignore(g_menu_device, g_menu_path_buf, filename))
+        {
+            return 0;
+        }
+
         node = grub_zalloc(sizeof(browser_node));
         if (!node)
         {

GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c

@@ -45,6 +45,7 @@
 #include <grub/charset.h>
 #include <grub/crypto.h>
 #include <grub/lib/crc.h>
+#include <grub/random.h>
 #include <grub/ventoy.h>
 #include "ventoy_def.h"
 #include "miniz.h"
@@ -106,12 +107,14 @@ grub_uint32_t g_wimiso_size = 0;
 
 int g_vhdboot_enable = 0;
 
-grub_uint64_t g_conf_replace_offset = 0;
 grub_uint64_t g_svd_replace_offset = 0;
-conf_replace *g_conf_replace_node = NULL;
-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_conf_replace_count = 0;
+grub_uint64_t g_conf_replace_offset[VTOY_MAX_CONF_REPLACE] = { 0 };
+conf_replace *g_conf_replace_node[VTOY_MAX_CONF_REPLACE] = { NULL };
+grub_uint8_t *g_conf_replace_new_buf[VTOY_MAX_CONF_REPLACE] = { NULL };
+int g_conf_replace_new_len[VTOY_MAX_CONF_REPLACE] = { 0 };
+int g_conf_replace_new_len_align[VTOY_MAX_CONF_REPLACE] = { 0 };
 
 int g_ventoy_disk_bios_id = 0;
 ventoy_gpt_info *g_ventoy_part_info = NULL;
@@ -145,8 +148,6 @@ static char g_iso_vd_id_application[130];
 static int g_pager_flag = 0;
 static char g_old_pager[32];
 
-static const char *g_vtoy_winpeshl_ini = "[LaunchApps]\r\nvtoyjump.exe";
-
 const char *g_menu_class[img_type_max] = 
 {
     "vtoyiso", "vtoywim", "vtoyefi", "vtoyimg", "vtoyvhd", "vtoyvtoy"
@@ -482,7 +483,7 @@ static int ventoy_load_efiboot_template(char **buf, int *datalen, int *direntoff
     return 0;
 }
 
-static int ventoy_set_check_result(int ret)
+static int ventoy_set_check_result(int ret, const char *msg)
 {
     char buf[32];
     
@@ -496,7 +497,8 @@ static int ventoy_set_check_result(int ret)
         grub_printf(VTOY_WARNING"\n");
         grub_printf(VTOY_WARNING"\n\n\n");
         
-        grub_printf("This is NOT a standard Ventoy device and is NOT supported (%d).\n\n", ret);
+        grub_printf("This is NOT a standard Ventoy device and is NOT supported (%d).\n", ret);
+        grub_printf("Error message: <%s>\n\n", msg);
         grub_printf("You should follow the instructions in https://www.ventoy.net to use Ventoy.\n");
         
         grub_printf("\n\nWill exit after 10 seconds ...... ");
@@ -522,7 +524,7 @@ static int ventoy_check_official_device(grub_device_t dev)
     
     if (dev->disk == NULL || dev->disk->partition == NULL)
     {
-        return ventoy_set_check_result(1 | 0x1000);
+        return ventoy_set_check_result(1 | 0x1000, "Internal Error");
     }
 
     if (0 == ventoy_check_file_exist("(%s,2)/ventoy/ventoy.cpio", dev->disk->name) ||
@@ -530,11 +532,17 @@ static int ventoy_check_official_device(grub_device_t dev)
         0 == ventoy_check_file_exist("(%s,2)/tool/mount.exfat-fuse_aarch64", dev->disk->name))
     {
         #ifndef GRUB_MACHINE_EFI
-        if (0 == ventoy_check_file_exist("(ventoydisk)/ventoy/ventoy.cpio", dev->disk->name) ||
-            0 == ventoy_check_file_exist("(ventoydisk)/grub/localboot.cfg", dev->disk->name) ||
-            0 == ventoy_check_file_exist("(ventoydisk)/tool/mount.exfat-fuse_aarch64", dev->disk->name))
+        if (0 == ventoy_check_file_exist("(ventoydisk)/ventoy/ventoy.cpio", dev->disk->name))
         {
-            return ventoy_set_check_result(2 | 0x1000);
+            return ventoy_set_check_result(2 | 0x1000, "File ventoy/ventoy.cpio missing in VTOYEFI partition");
+        }
+        else if (0 == ventoy_check_file_exist("(ventoydisk)/grub/localboot.cfg", dev->disk->name))
+        {
+            return ventoy_set_check_result(2 | 0x1000, "File grub/localboot.cfg missing in VTOYEFI partition");
+        }
+        else if (0 == ventoy_check_file_exist("(ventoydisk)/tool/mount.exfat-fuse_aarch64", dev->disk->name))
+        {
+            return ventoy_set_check_result(2 | 0x1000, "File tool/mount.exfat-fuse_aarch64 missing in VTOYEFI partition");
         }
         else
         {
@@ -554,19 +562,19 @@ static int ventoy_check_official_device(grub_device_t dev)
     }
     if (!file)
     {
-        return ventoy_set_check_result(3 | 0x1000);
+        return ventoy_set_check_result(3 | 0x1000, "File ventoy/ventoy.cpio open failed in VTOYEFI partition");
     }
 
     if (NULL == grub_strstr(file->fs->name, "fat"))
     {
         grub_file_close(file);
-        return ventoy_set_check_result(4 | 0x1000);
+        return ventoy_set_check_result(4 | 0x1000, "VTOYEFI partition is not FAT filesystem");
     }
 
     partition = dev->disk->partition;
     if (partition->number != 0 || partition->start != 2048)
     {
-        return ventoy_set_check_result(5);
+        return ventoy_set_check_result(5, "Ventoy partition is not start at 1MB");
     }
 
     if (workaround)
@@ -578,7 +586,7 @@ static int ventoy_check_official_device(grub_device_t dev)
                 (PartTbl[1].LastLBA + 1 - PartTbl[1].StartLBA) != 65536)
             {
                 grub_file_close(file);
-                return ventoy_set_check_result(6);
+                return ventoy_set_check_result(6, "Disk partition layout check failed.");
             }
         }
         else
@@ -588,7 +596,7 @@ static int ventoy_check_official_device(grub_device_t dev)
                 PartTbl[1].SectorCount != 65536)
             {
                 grub_file_close(file);
-                return ventoy_set_check_result(6);
+                return ventoy_set_check_result(6, "Disk partition layout check failed.");
             }
         }
     }
@@ -599,7 +607,7 @@ static int ventoy_check_official_device(grub_device_t dev)
         if ((partition->number != 1) || (partition->len != 65536) || (offset != partition->start))
         {
             grub_file_close(file);
-            return ventoy_set_check_result(7);
+            return ventoy_set_check_result(7, "Disk partition layout check failed.");
         }
     }
 
@@ -611,21 +619,21 @@ static int ventoy_check_official_device(grub_device_t dev)
         dev2 = grub_device_open(devname);
         if (!dev2)
         {
-            return ventoy_set_check_result(8);
+            return ventoy_set_check_result(8, "Disk open failed");
         }
 
         fs = grub_fs_probe(dev2);
         if (!fs)
         {
             grub_device_close(dev2);
-            return ventoy_set_check_result(9);
+            return ventoy_set_check_result(9, "FS probe failed");
         }
 
         fs->fs_label(dev2, &label);
         if ((!label) || grub_strncmp("VTOYEFI", label, 7))
         {
             grub_device_close(dev2);
-            return ventoy_set_check_result(10);
+            return ventoy_set_check_result(10, "Partition name is not VTOYEFI");
         }
 
         grub_device_close(dev2);    
@@ -635,7 +643,7 @@ static int ventoy_check_official_device(grub_device_t dev)
     disk = grub_disk_open(dev->disk->name);
     if (!disk)
     {
-        return ventoy_set_check_result(11);
+        return ventoy_set_check_result(11, "Disk open failed");
     }
 
     grub_memset(mbr, 0, 512);
@@ -644,10 +652,10 @@ static int ventoy_check_official_device(grub_device_t dev)
     
     if (grub_memcmp(g_check_mbr_data, mbr, 0x30) || grub_memcmp(g_check_mbr_data + 0x30, mbr + 0x190, 16))
     {
-        return ventoy_set_check_result(12);
+        return ventoy_set_check_result(12, "MBR check failed");
     }
 
-    return ventoy_set_check_result(0);
+    return ventoy_set_check_result(0, NULL);
 }
 
 static int ventoy_check_ignore_flag(const char *filename, const struct grub_dirhook_info *info, void *data)
@@ -1138,6 +1146,10 @@ grub_ssize_t ventoy_load_file_with_prompt(grub_file_t file, void *buf, grub_ssiz
         left -= VTOY_SIZE_2MB;
 
         div = grub_divmod64((grub_uint64_t)((size - left) * 100), (grub_uint64_t)size, &ro);
+        if (div < 1)
+        {
+            div = 1;
+        }
         grub_printf("\r%s   %d%%    ", g_vtoy_prompt_msg, (int)div);
         grub_refresh();  
     }
@@ -3242,8 +3254,9 @@ static grub_err_t ventoy_cmd_img_sector(grub_extcmd_context_t ctxt, int argc, ch
         return grub_error(GRUB_ERR_BAD_ARGUMENT, "Can't open file %s\n", args[0]); 
     }
 
-    g_conf_replace_node = NULL;
-    g_conf_replace_offset = 0;
+    g_conf_replace_count = 0;
+    grub_memset(g_conf_replace_node, 0, sizeof(g_conf_replace_node ));
+    grub_memset(g_conf_replace_offset, 0, sizeof(g_conf_replace_offset ));
     
     if (g_img_chunk_list.chunk)
     {
@@ -3286,11 +3299,15 @@ static grub_err_t ventoy_cmd_img_sector(grub_extcmd_context_t ctxt, int argc, ch
 
 static grub_err_t ventoy_select_conf_replace(grub_extcmd_context_t ctxt, int argc, char **args)
 {
+    int i;
+    int n;
     grub_uint64_t offset = 0;
     grub_uint32_t align = 0;
     grub_file_t file = NULL;
     conf_replace *node = NULL;
-        
+    conf_replace *nodes[VTOY_MAX_CONF_REPLACE] = { NULL };
+    ventoy_grub_param_file_replace *replace = NULL;
+    
     (void)ctxt;
     (void)argc;
     (void)args;
@@ -3302,68 +3319,294 @@ static grub_err_t ventoy_select_conf_replace(grub_extcmd_context_t ctxt, int arg
         return 0;
     }
 
-    node = ventoy_plugin_find_conf_replace(args[1]);
-    if (!node)
+    n = ventoy_plugin_find_conf_replace(args[1], nodes);
+    if (!n)
     {
         debug("Conf replace not found for %s\n", args[1]);
         goto end;
     }
 
-    debug("Find conf replace for %s\n", args[1]);
+    debug("Find %d conf replace for %s\n", n, args[1]);
 
-    file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "(loop)%s", node->orgconf);
-    if (file)
+    g_conf_replace_count = n;
+    for (i = 0; i < n; i++)
     {
-        offset = grub_iso9660_get_last_file_dirent_pos(file);
-        grub_file_close(file);  
+        node = nodes[i];
+
+        file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "(loop)%s", node->orgconf);
+        if (file)
+        {
+            offset = grub_iso9660_get_last_file_dirent_pos(file);
+            grub_file_close(file);  
+        }
+        else if (node->img > 0)
+        {
+            offset = 0;
+        }
+        else
+        {
+            debug("<(loop)%s> NOT exist\n", node->orgconf);
+            continue;
+        }
+
+        file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s%s", args[0], node->newconf);
+        if (!file)
+        {
+            debug("New config file <%s%s> NOT exist\n", args[0], node->newconf);
+            continue;
+        }
+
+        align = ((int)file->size + 2047) / 2048 * 2048;
+
+        if (align > vtoy_max_replace_file_size)
+        {
+            debug("New config file <%s%s> too big\n", args[0], node->newconf);
+            grub_file_close(file);
+            continue;
+        }
+
+        grub_file_read(file, g_conf_replace_new_buf[i], file->size);
+        grub_file_close(file);
+        g_conf_replace_new_len[i] = (int)file->size;
+        g_conf_replace_new_len_align[i] = align;
+
+        g_conf_replace_node[i] = node;
+        g_conf_replace_offset[i] = offset + 2;
+
+        if (node->img > 0)
+        {
+            replace = &(g_grub_param->img_replace[i]);
+            replace->magic = GRUB_IMG_REPLACE_MAGIC;
+            grub_snprintf(replace->old_file_name[replace->old_name_cnt], 256, "%s", node->orgconf);
+            replace->old_name_cnt++;
+        }
+
+        debug("conf_replace OK: newlen[%d]: %d img:%d\n", i, g_conf_replace_new_len[i], node->img);
     }
-    else if (node->img > 0)
+
+end:
+    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
+}
+
+static int ventoy_var_expand(int *record, int *flag, const char *var, char *expand, int len)
+{
+    int i = 0;
+    int n = 0;
+    char c;
+    const char *ch = var;
+
+    *record = 0;
+    expand[0] = 0;
+
+    while (*ch)
     {
-        offset = 0;
+        if (*ch == '_' || (*ch >= '0' && *ch <= '9') || (*ch >= 'A' && *ch <= 'Z') || (*ch >= 'a' && *ch <= 'z'))
+        {
+            ch++;
+            n++;
+        }
+        else
+        {
+            debug("Invalid variable letter <%c>\n", *ch);
+            goto end;
+        }
+    }
+
+    if (n > 32)
+    {
+        debug("Invalid variable length:%d <%s>\n", n, var);
+        goto end;
+    }
+
+    if (grub_strncmp(var, "VT_", 3) == 0) /* built-in variables */
+    {
+
     }
     else
     {
-        debug("<(loop)%s> NOT exist\n", node->orgconf);
-        goto end;
+        if (*flag == 0)
+        {
+            *flag = 1;
+            grub_printf("\n===================  Variables Expansion  ===================\n\n");
+        }
+    
+        grub_printf("<%s>: ", var);
+        grub_refresh();
+
+        while (i < (len - 1))
+        {
+            c = grub_getkey();
+            if ((c == '\n') || (c == '\r'))
+            {
+                if (i > 0)
+                {
+                    grub_printf("\n");
+                    grub_refresh();
+                    *record = 1;
+                    break;                    
+                }
+            }
+            else if (grub_isprint(c))
+            {
+                if (i + 1 < (len - 1))
+                {
+                    grub_printf("%c", c);
+                    grub_refresh();
+                    expand[i++] = c;
+                    expand[i] = 0;
+                }
+            }
+            else if (c == '\b')
+            {
+                if (i > 0)
+                {
+                    expand[i - 1] = ' ';
+                    grub_printf("\r<%s>: %s", var, expand);
+
+                    expand[i - 1] = 0;
+                    grub_printf("\r<%s>: %s", var, expand);
+                    
+                    grub_refresh();
+                    i--;
+                }
+            }
+        }
     }
 
-    file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s%s", args[0], node->newconf);
-    if (!file)
-    {
-        debug("New config file <%s%s> NOT exist\n", args[0], node->newconf);
-        goto end;
-    }
-
-    align = ((int)file->size + 2047) / 2048 * 2048;
-
-    if (align > vtoy_max_replace_file_size)
-    {
-        debug("New config file <%s%s> too big\n", args[0], node->newconf);
-        goto end;
-    }
-
-    grub_file_read(file, g_conf_replace_new_buf, file->size);
-    g_conf_replace_new_len = (int)file->size;
-    g_conf_replace_new_len_align = align;
-
-    g_conf_replace_node = node;
-    g_conf_replace_offset = offset + 2;
-
-    if (node->img > 0)
-    {
-        g_grub_param->img_replace.magic = GRUB_IMG_REPLACE_MAGIC;
-        g_grub_param->img_replace.old_name_cnt = 1;
-        grub_snprintf(g_grub_param->img_replace.old_file_name[0], 256, "%s", node->orgconf);
-    }
-
-    debug("conf_replace OK: newlen: %d\n", g_conf_replace_new_len);
-
 end:
-    if (file)
+    if (expand[0] == 0)
     {
-        grub_file_close(file);        
+        grub_snprintf(expand, len, "$$%s$$", var);
     }
-    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
+    
+    return 0;
+}
+
+static int ventoy_auto_install_var_expand(install_template *node)
+{
+    int pos = 0;
+    int flag = 0;
+    int record = 0;
+    int newlen = 0;
+    char *start = NULL;
+    char *end = NULL;
+    char *newbuf = NULL;
+    char *curline = NULL;
+    char *nextline = NULL;
+    grub_uint8_t *code = NULL;
+    char value[512];
+    var_node *CurNode = NULL;
+    var_node *pVarList = NULL;
+
+    code = (grub_uint8_t *)node->filebuf;
+
+    if (node->filelen >= VTOY_SIZE_1MB)
+    {
+        debug("auto install script too long %d\n", node->filelen);
+        return 0;
+    }
+    
+    if ((code[0] == 0xff && code[1] == 0xfe) || (code[0] == 0xfe && code[1] == 0xff))
+    {
+        debug("UCS-2 encoding NOT supported\n");
+        return 0;
+    }
+
+    start = grub_strstr(node->filebuf, "$$");
+    if (!start)
+    {
+        debug("no need to expand variable, no start.\n");
+        return 0;
+    }
+
+    end = grub_strstr(start + 2, "$$");
+    if (!end)
+    {
+        debug("no need to expand variable, no end.\n");
+        return 0;
+    }
+
+    newlen = grub_max(node->filelen * 10, VTOY_SIZE_128KB);
+    newbuf = grub_malloc(newlen);
+    if (!newbuf)
+    {
+        debug("Failed to alloc newbuf %d\n", newlen);
+        return 0;
+    }
+
+    for (curline = node->filebuf; curline; curline = nextline)
+    {
+        nextline = ventoy_get_line(curline);
+
+        start = grub_strstr(curline, "$$");
+        if (start)
+        {
+            end = grub_strstr(start + 2, "$$");
+        }
+
+        if (start && end)
+        {
+            *start = *end = 0;
+            VTOY_APPEND_NEWBUF(curline);
+
+            for (CurNode = pVarList; CurNode; CurNode = CurNode->next)
+            {
+                if (grub_strcmp(start + 2, CurNode->var) == 0)
+                {
+                    grub_snprintf(value, sizeof(value) - 1, "%s", CurNode->val);
+                    break;
+                }
+            }
+
+            if (!CurNode)
+            {
+                value[sizeof(value) - 1] = 0;
+                ventoy_var_expand(&record, &flag, start + 2, value, sizeof(value) - 1);
+
+                if (record)
+                {
+                    CurNode = grub_zalloc(sizeof(var_node));
+                    if (CurNode)
+                    {
+                        grub_snprintf(CurNode->var, sizeof(CurNode->var), "%s", start + 2);
+                        grub_snprintf(CurNode->val, sizeof(CurNode->val), "%s", value);
+                        CurNode->next = pVarList;
+                        pVarList = CurNode;
+                    }
+                }
+            }
+            
+            VTOY_APPEND_NEWBUF(value);
+            
+            VTOY_APPEND_NEWBUF(end + 2);
+        }
+        else
+        {
+            VTOY_APPEND_NEWBUF(curline);
+        }
+
+        if (pos > 0 && newbuf[pos - 1] == '\r')
+        {
+            newbuf[pos - 1] = '\n';
+        }
+        else
+        {
+            newbuf[pos++] = '\n';
+        }
+    }
+
+    grub_free(node->filebuf);
+    node->filebuf = newbuf;
+    node->filelen = pos;
+
+    while (pVarList)
+    {
+        CurNode = pVarList->next;
+        grub_free(pVarList);
+        pVarList = CurNode;
+    }
+
+    return 0;
 }
 
 static grub_err_t ventoy_cmd_sel_auto_install(grub_extcmd_context_t ctxt, int argc, char **args)
@@ -3372,6 +3615,7 @@ static grub_err_t ventoy_cmd_sel_auto_install(grub_extcmd_context_t ctxt, int ar
     int pos = 0;
     int defidx = 1;
     char *buf = NULL;
+    grub_file_t file = NULL;
     char configfile[128];
     install_template *node = NULL;
         
@@ -3400,7 +3644,7 @@ static grub_err_t ventoy_cmd_sel_auto_install(grub_extcmd_context_t ctxt, int ar
         {
             node->cursel = node->autosel - 1;
             debug("Auto install template auto select %d\n", node->autosel);
-            return 0;
+            goto load;
         }
     }
 
@@ -3415,12 +3659,12 @@ static grub_err_t ventoy_cmd_sel_auto_install(grub_extcmd_context_t ctxt, int ar
         vtoy_ssprintf(buf, pos, "set timeout=%d\n", node->timeout);        
     }
     
-    vtoy_ssprintf(buf, pos, "menuentry \"Boot without auto installation template\" {\n"
+    vtoy_ssprintf(buf, pos, "menuentry \"Boot without auto installation template\" --class=\"sel_auto_install\" {\n"
                   "  echo %s\n}\n", "");
 
     for (i = 0; i < node->templatenum; i++)
     {
-        vtoy_ssprintf(buf, pos, "menuentry \"Boot with %s\"{\n"
+        vtoy_ssprintf(buf, pos, "menuentry \"Boot with %s\" --class=\"sel_auto_install\" {\n"
                   "  echo \"\"\n}\n",
                   node->templatepath[i].path);
     }
@@ -3440,6 +3684,35 @@ static grub_err_t ventoy_cmd_sel_auto_install(grub_extcmd_context_t ctxt, int ar
 
     node->cursel = g_ventoy_last_entry - 1;
 
+load:
+    grub_check_free(node->filebuf);
+    node->filelen = 0;
+
+    if (node->cursel >= 0 && node->cursel < node->templatenum)
+    {
+        file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s%s", ventoy_get_env("vtoy_iso_part"), 
+            node->templatepath[node->cursel].path);
+        if (file)
+        {
+            node->filebuf = grub_malloc(file->size + 8);
+            if (node->filebuf)
+            {
+                grub_file_read(file, node->filebuf, file->size);
+                grub_file_close(file);
+                
+                grub_memset(node->filebuf + file->size, 0, 8);
+                node->filelen = (int)file->size;
+
+                ventoy_auto_install_var_expand(node);
+            }
+        }
+        else
+        {
+            debug("Failed to open auto install script <%s%s>\n", 
+                ventoy_get_env("vtoy_iso_part"), node->templatepath[node->cursel].path);
+        }
+    }
+
     VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
 
@@ -3492,12 +3765,12 @@ static grub_err_t ventoy_cmd_sel_persistence(grub_extcmd_context_t ctxt, int arg
         vtoy_ssprintf(buf, pos, "set timeout=%d\n", node->timeout);        
     }
 
-    vtoy_ssprintf(buf, pos, "menuentry \"Boot without persistence\" {\n"
+    vtoy_ssprintf(buf, pos, "menuentry \"Boot without persistence\" --class=\"sel_persistence\" {\n"
                   "  echo %s\n}\n", "");
     
     for (i = 0; i < node->backendnum; i++)
     {
-        vtoy_ssprintf(buf, pos, "menuentry \"Boot with %s\" {\n"
+        vtoy_ssprintf(buf, pos, "menuentry \"Boot with %s\" --class=\"sel_persistence\" {\n"
                       "  echo \"\"\n}\n",
                       node->backendpath[i].path);
         
@@ -3715,20 +3988,70 @@ static grub_err_t ventoy_cmd_dump_persistence(grub_extcmd_context_t ctxt, int ar
     return 0;
 }
 
+static int ventoy_check_mode_by_name(char *filename, const char *suffix)
+{
+    int i;
+    int len1;
+    int len2;
+    
+    len1 = (int)grub_strlen(filename);
+    len2 = (int)grub_strlen(suffix);
+
+    if (len1 <= len2)
+    {
+        return 0;
+    }
+
+    for (i = len1 - 1; i >= 0; i--)
+    {
+        if (filename[i] == '.')
+        {
+            break;
+        }
+    }
+
+    if (i < len2 + 1)
+    {
+        return 0;
+    }
+
+    if (filename[i - len2 - 1] != '_')
+    {
+        return 0;
+    }
+
+    if (grub_strncasecmp(filename + (i - len2), suffix, len2) == 0)
+    {
+        return 1;
+    }
+    
+    return 0;
+}
+
 static grub_err_t ventoy_cmd_check_mode(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     (void)ctxt;
     (void)argc;
     (void)args;
 
-    if (argc != 1)
+    if (argc != 1 && argc != 2)
     {
         return 1;
     }
 
     if (args[0][0] == '0')
     {
-        return g_ventoy_memdisk_mode ? 0 : 1;
+        if (g_ventoy_memdisk_mode)
+        {
+            return 0;
+        }
+
+        if (argc == 2 && ventoy_check_mode_by_name(args[1], "vtmemdisk"))
+        {
+            return 0;
+        }
+
+        return 1;
     }
     else if (args[0][0] == '1')
     {
@@ -3740,11 +4063,31 @@ static grub_err_t ventoy_cmd_check_mode(grub_extcmd_context_t ctxt, int argc, ch
     }
     else if (args[0][0] == '3')
     {
-        return g_ventoy_grub2_mode ? 0 : 1;
+        if (g_ventoy_grub2_mode)
+        {
+            return 0;
+        }
+    
+        if (argc == 2 && ventoy_check_mode_by_name(args[1], "vtgrub2"))
+        {
+            return 0;
+        }
+
+        return 1;
     }
     else if (args[0][0] == '4')
     {
-        return g_ventoy_wimboot_mode ? 0 : 1;
+        if (g_ventoy_wimboot_mode)
+        {
+            return 0;
+        }
+    
+        if (argc == 2 && ventoy_check_mode_by_name(args[1], "vtwimboot"))
+        {
+            return 0;
+        }
+
+        return 1;
     }
 
     return 1;
@@ -5615,8 +5958,148 @@ static grub_err_t ventoy_cmd_dump_rsv_page(grub_extcmd_context_t ctxt, int argc,
     VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
 
+static grub_err_t ventoy_cmd_need_secondary_menu(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    const char *env = NULL;
+    
+    (void)ctxt;
+    (void)argc;
+
+    if (g_ventoy_memdisk_mode || g_ventoy_grub2_mode || g_ventoy_wimboot_mode || g_ventoy_iso_raw)
+    {
+        return 1;
+    }
+
+    if (ventoy_check_mode_by_name(args[0], "vtmemdisk") ||
+        ventoy_check_mode_by_name(args[0], "vtgrub2") ||
+        ventoy_check_mode_by_name(args[0], "vtwimboot"))
+    {
+        return 1;
+    }
+
+    env = grub_env_get("VTOY_SECONDARY_BOOT_MENU");
+    if (env && env[0] == '0' && env[1] == 0)
+    {
+        return 1;
+    }
+
+    return 0;
+}
+
+static grub_err_t ventoy_cmd_show_secondary_menu(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    int n = 0;
+    int pos = 0;
+    int len = 0;
+    int select = 0;
+    int timeout = 0;
+    char *cmd = NULL;
+    const char *env = NULL;
+    ulonglong fsize = 0;
+    char cfgfile[128];
+    int seldata[16] = {0};
+
+    (void)ctxt;
+    (void)argc;
+
+    len = 8 * VTOY_SIZE_1KB;
+    cmd = (char *)grub_malloc(len);
+    if (!cmd)
+    {
+        return 1;
+    }
+
+    grub_env_unset("VTOY_CHKSUM_FILE_PATH");
+
+    env = grub_env_get("VTOY_SECONDARY_TIMEOUT");
+    if (env)
+    {
+        timeout = (int)grub_strtol(env, NULL, 10);
+    }
+
+    if (timeout > 0)
+    {
+        vtoy_len_ssprintf(cmd, pos, len, "set timeout=%d\n", timeout);
+    }
+
+    fsize = grub_strtoull(args[2], NULL, 10);
+
+    vtoy_dummy_menuentry(cmd, pos, len, "Boot in normal mode", "second_normal"); seldata[n++] = 1;
+
+    if (grub_strcmp(args[1], "Unix") != 0)
+    {
+        if (grub_strcmp(args[1], "Windows") == 0)
+        {
+            vtoy_dummy_menuentry(cmd, pos, len, "Boot in wimboot mode", "second_wimboot"); seldata[n++] = 2;
+        }
+        else
+        {
+            vtoy_dummy_menuentry(cmd, pos, len, "Boot in grub2 mode", "second_grub2"); seldata[n++] = 3;
+        }
+
+        if (fsize <= VTOY_SIZE_1GB)
+        {
+            vtoy_dummy_menuentry(cmd, pos, len, "Boot in memdisk mode", "second_memdisk"); seldata[n++] = 4;
+        }
+    }
+
+    vtoy_dummy_menuentry(cmd, pos, len, "File checksum", "second_checksum"); seldata[n++] = 5;
+
+    do {
+        g_ventoy_menu_esc = 1;
+        g_ventoy_suppress_esc = 1;
+        g_ventoy_suppress_esc_default = 0;
+        grub_snprintf(cfgfile, sizeof(cfgfile), "configfile mem:0x%llx:size:%d", (ulonglong)(ulong)cmd, pos);
+        grub_script_execute_sourcecode(cfgfile);
+        g_ventoy_menu_esc = 0;
+        g_ventoy_suppress_esc = 0;
+        g_ventoy_suppress_esc_default = 1;
+
+        select = seldata[g_ventoy_last_entry];
+        
+        if (select == 2)
+        {
+            g_ventoy_wimboot_mode = 1;
+        }
+        else if (select == 3)
+        {
+            g_ventoy_grub2_mode = 1;
+        }
+        else if (select == 4)
+        {
+            g_ventoy_memdisk_mode = 1;
+        }
+        else if (select == 5)
+        {
+            grub_env_set("VTOY_CHKSUM_FILE_PATH", args[0]);
+            grub_script_execute_sourcecode("configfile $vtoy_efi_part/grub/checksum.cfg");
+        }
+    }while (select == 5);
+
+    grub_free(cmd);
+    return 0;
+}
+
+static grub_err_t ventoy_cmd_fs_ignore_case(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    (void)ctxt;
+    (void)argc;
+
+    if (args[0][0] == '0')
+    {
+        g_ventoy_case_insensitive = 0;
+    }
+    else
+    {
+        g_ventoy_case_insensitive = 1;
+    }
+
+    return 0;
+}
+
 int ventoy_env_init(void)
 {
+    int i;
     char buf[64];
 
     grub_env_set("vtdebug_flag", "");
@@ -5624,7 +6107,10 @@ int ventoy_env_init(void)
     g_part_list_buf = grub_malloc(VTOY_PART_BUF_LEN);
     g_tree_script_buf = grub_malloc(VTOY_MAX_SCRIPT_BUF);
     g_list_script_buf = grub_malloc(VTOY_MAX_SCRIPT_BUF);
-    g_conf_replace_new_buf = grub_malloc(vtoy_max_replace_file_size); 
+    for (i = 0; i < VTOY_MAX_CONF_REPLACE; i++)
+    {
+        g_conf_replace_new_buf[i] = grub_malloc(vtoy_max_replace_file_size);         
+    }
 
     ventoy_filt_register(0, ventoy_wrapper_open);
 
@@ -5642,12 +6128,6 @@ int ventoy_env_init(void)
         grub_env_export("ventoy_env_param");
     }
 
-    grub_snprintf(buf, sizeof(buf), "0x%lx", (ulong)g_vtoy_winpeshl_ini);
-    grub_env_set("vtoy_winpeshl_ini_addr", buf);
-
-    grub_snprintf(buf, sizeof(buf), "%d", (int)grub_strlen(g_vtoy_winpeshl_ini));
-    grub_env_set("vtoy_winpeshl_ini_size", buf);
-
     grub_env_export("vtoy_winpeshl_ini_addr");
     grub_env_export("vtoy_winpeshl_ini_size");
 
@@ -5817,6 +6297,12 @@ static cmd_para ventoy_cmds[] =
     { "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 },
+    { "vt_is_standard_winiso", ventoy_cmd_is_standard_winiso, 0, NULL, "", "", NULL },
+    { "vt_sel_winpe_wim", ventoy_cmd_sel_winpe_wim, 0, NULL, "", "", NULL },
+    { "vt_need_secondary_menu", ventoy_cmd_need_secondary_menu, 0, NULL, "", "", NULL },
+    { "vt_show_secondary_menu", ventoy_cmd_show_secondary_menu, 0, NULL, "", "", NULL },
+    { "vt_fs_ignore_case", ventoy_cmd_fs_ignore_case, 0, NULL, "", "", NULL },
+    { "vt_systemd_menu", ventoy_cmd_linux_systemd_menu, 0, NULL, "", "", NULL },
 };
 
 int ventoy_register_all_cmd(void)

GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h

@@ -29,6 +29,8 @@
 
 #define VTOY_FILT_MIN_FILE_SIZE  32768
 
+#define VTOY_LINUX_SYSTEMD_MENU_MAX_BUF    16384
+
 #define VTOY_SIZE_1GB     1073741824
 #define VTOY_SIZE_1MB     (1024 * 1024)
 #define VTOY_SIZE_2MB     (2 * 1024 * 1024)
@@ -36,11 +38,14 @@
 #define VTOY_SIZE_512KB   (512 * 1024)
 #define VTOY_SIZE_1KB     1024
 #define VTOY_SIZE_32KB    (32 * 1024)
+#define VTOY_SIZE_128KB   (128 * 1024)
 
 #define JSON_SUCCESS    0
 #define JSON_FAILED     1
 #define JSON_NOT_FOUND  2
 
+#define WINDATA_FLAG_TEMPLATE   1
+
 #define ulong unsigned long
 #define ulonglong  unsigned long long
 
@@ -84,6 +89,16 @@
     return (err);\
 }
 
+#define VTOY_APPEND_NEWBUF(buf) \
+{\
+    char *__c = buf;\
+    while (*__c)\
+    {\
+        newbuf[pos++] = *__c;\
+        __c++;\
+    }\
+}
+
 typedef enum VTOY_FILE_FLT
 {
     VTOY_FILE_FLT_ISO = 0, /* .iso */
@@ -316,9 +331,16 @@ void ventoy_debug(const char *fmt, ...);
 #define vtoy_ssprintf(buf, pos, fmt, args...) \
     pos += grub_snprintf(buf + pos, VTOY_MAX_SCRIPT_BUF - pos, fmt, ##args)
 
+#define vtoy_len_ssprintf(buf, pos, len, fmt, args...) \
+    pos += grub_snprintf(buf + pos, len - pos, fmt, ##args)
+
 #define browser_ssprintf(mbuf, fmt, args...) \
     (mbuf)->pos += grub_snprintf((mbuf)->buf + (mbuf)->pos, (mbuf)->max - (mbuf)->pos, fmt, ##args)
 
+#define vtoy_dummy_menuentry(buf, pos, len, title, class) \
+    vtoy_len_ssprintf(buf, pos, len, "menuentry \"%s\" --class=\"%s\" {\n  echo \"\"\n}\n", title, class)
+
+
 #define FLAG_HEADER_RESERVED          0x00000001
 #define FLAG_HEADER_COMPRESSION       0x00000002
 #define FLAG_HEADER_READONLY          0x00000004
@@ -488,6 +510,7 @@ typedef struct wim_tail
     grub_uint8_t *jump_bin_data;
     grub_uint32_t bin_raw_len;
     grub_uint32_t bin_align_len;
+    grub_uint32_t windata_flag;
 
     grub_uint8_t *new_meta_data;
     grub_uint32_t new_meta_len;
@@ -587,6 +610,7 @@ typedef struct chk_case_fs_dir
     grub_fs_t fs;
 }chk_case_fs_dir;
 
+int ventoy_str_all_digit(const char *str);
 int ventoy_strcmp(const char *pattern, const char *str);
 int ventoy_strncmp (const char *pattern, const char *str, grub_size_t n);
 void ventoy_fill_os_param(grub_file_t file, ventoy_os_param *param);
@@ -598,6 +622,7 @@ grub_err_t ventoy_cmd_clear_initrd_list(grub_extcmd_context_t ctxt, int argc, ch
 grub_uint32_t ventoy_get_iso_boot_catlog(grub_file_t file);
 int ventoy_has_efi_eltorito(grub_file_t file, grub_uint32_t sector);
 grub_err_t ventoy_cmd_linux_chain_data(grub_extcmd_context_t ctxt, int argc, char **args);
+grub_err_t ventoy_cmd_linux_systemd_menu(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_linux_locate_initrd(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_initrd_count(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_valid_initrd_count(grub_extcmd_context_t ctxt, int argc, char **args);
@@ -618,6 +643,7 @@ grub_err_t ventoy_cmd_windows_chain_data(grub_extcmd_context_t ctxt, int argc, c
 grub_err_t ventoy_cmd_windows_wimboot_data(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_wim_chain_data(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_wim_check_bootable(grub_extcmd_context_t ctxt, int argc, char **args);
+grub_err_t ventoy_cmd_is_standard_winiso(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_dump_wim_patch(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_sel_wimboot(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_set_wim_prompt(grub_extcmd_context_t ctxt, int argc, char **args);
@@ -853,6 +879,9 @@ typedef struct install_template
     int templatenum;
     file_fullpath *templatepath;
 
+    char *filebuf;
+    int filelen;
+
     struct install_template *next;
 }install_template;
 
@@ -942,7 +971,7 @@ typedef struct custom_boot
     struct custom_boot *next;
 }custom_boot;
 
-#define vtoy_max_replace_file_size  (2 * 1024 * 1024)
+#define vtoy_max_replace_file_size  (1024 * 1024)
 typedef struct conf_replace
 {
     int pathlen;
@@ -1028,12 +1057,13 @@ extern int g_vhdboot_enable;
 extern int g_plugin_image_list;
 
 extern ventoy_gpt_info *g_ventoy_part_info;
-extern grub_uint64_t g_conf_replace_offset;
+extern int g_conf_replace_count;
+extern grub_uint64_t g_conf_replace_offset[VTOY_MAX_CONF_REPLACE];
 extern grub_uint64_t g_svd_replace_offset;
-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 conf_replace *g_conf_replace_node[VTOY_MAX_CONF_REPLACE];
+extern grub_uint8_t *g_conf_replace_new_buf[VTOY_MAX_CONF_REPLACE];
+extern int g_conf_replace_new_len[VTOY_MAX_CONF_REPLACE];
+extern int g_conf_replace_new_len_align[VTOY_MAX_CONF_REPLACE];
 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];
@@ -1061,15 +1091,15 @@ extern grub_uint32_t g_ventoy_plat_data;
 void ventoy_str_tolower(char *str);
 void ventoy_str_toupper(char *str);
 char * ventoy_get_line(char *start);
+char *ventoy_str_last(char *str, char ch);
 int ventoy_cmp_img(img_info *img1, img_info *img2);
 void ventoy_swap_img(img_info *img1, img_info *img2);
-char * ventoy_plugin_get_cur_install_template(const char *isopath);
+char * ventoy_plugin_get_cur_install_template(const char *isopath, install_template **cur);
 install_template * ventoy_plugin_find_install_template(const char *isopath);
 persistence_config * ventoy_plugin_find_persistent(const char *isopath);
 grub_uint64_t ventoy_get_vtoy_partsize(int part);
 void ventoy_plugin_dump_injection(void);
 void ventoy_plugin_dump_auto_install(void);
-int ventoy_fill_windows_rtdata(void *buf, char *isopath);
 int ventoy_plugin_get_persistent_chunklist(const char *isopath, int index, ventoy_img_chunk_list *chunk_list);
 const char * ventoy_plugin_get_injection(const char *isopath);
 const char * ventoy_plugin_get_menu_alias(int type, const char *isopath);
@@ -1077,7 +1107,7 @@ const menu_tip * ventoy_plugin_get_menu_tip(int type, const char *isopath);
 const char * ventoy_plugin_get_menu_class(int type, const char *name, const char *path);
 int ventoy_plugin_check_memdisk(const char *isopath);
 int ventoy_plugin_get_image_list_index(int type, const char *name);
-conf_replace * ventoy_plugin_find_conf_replace(const char *iso);
+int ventoy_plugin_find_conf_replace(const char *iso, conf_replace *nodes[VTOY_MAX_CONF_REPLACE]);
 dud * ventoy_plugin_find_dud(const char *iso);
 int ventoy_plugin_load_dud(dud *node, const char *isopart);
 int ventoy_get_block_list(grub_file_t file, ventoy_img_chunk_list *chunklist, grub_disk_addr_t start);
@@ -1092,6 +1122,7 @@ grub_err_t ventoy_cmd_linux_get_main_initrd_index(grub_extcmd_context_t ctxt, in
 grub_err_t ventoy_cmd_collect_wim_patch(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_wim_patch_count(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_locate_wim_patch(grub_extcmd_context_t ctxt, int argc, char **args);
+grub_err_t ventoy_cmd_sel_winpe_wim(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_unix_chain_data(grub_extcmd_context_t ctxt, int argc, char **args);
 int ventoy_get_disk_guid(const char *filename, grub_uint8_t *guid, grub_uint8_t *signature);
 grub_err_t ventoy_cmd_unix_reset(grub_extcmd_context_t ctxt, int argc, char **args);
@@ -1191,6 +1222,24 @@ typedef struct browser_node
     struct browser_node *next;
 }browser_node;
 
+typedef struct var_node
+{
+    char var[128];
+    char val[256];
+
+    struct var_node *next;
+}var_node;
+
+typedef struct systemd_menu_ctx
+{
+    char *dev;
+    char *buf;
+    int pos;
+    int len;
+}systemd_menu_ctx;
+
+#define vtoy_check_goto_out(p)  if (!p) goto out
+
 extern char *g_tree_script_buf;
 extern int g_tree_script_pos;
 extern int g_tree_script_pre;
@@ -1206,6 +1255,7 @@ grub_err_t ventoy_cmd_browser_dir(grub_extcmd_context_t ctxt, int argc, char **a
 grub_err_t ventoy_cmd_browser_disk(grub_extcmd_context_t ctxt, int argc, char **args);
 int ventoy_get_fs_type(const char *fs);
 int ventoy_img_name_valid(const char *filename, grub_size_t namelen);
+void * ventoy_alloc_chain(grub_size_t size);
 
 #endif /* __VENTOY_DEF_H__ */
 

GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_linux.c

@@ -333,12 +333,84 @@ end:
     VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
 
+static int ventoy_linux_initrd_collect_hook(const char *filename, const struct grub_dirhook_info *info, void *data)
+{
+    int len;
+    initrd_info *img = NULL;
+    
+    (void)data;
+
+    if (0 == info->dir)
+    {
+        if (grub_strncmp(filename, "initrd", 6) == 0)
+        {
+            len = (int)grub_strlen(filename);
+            if (grub_strcmp(filename + len - 4, ".img") == 0)
+            {
+                img = grub_zalloc(sizeof(initrd_info));
+                if (img)
+                {
+                    grub_snprintf(img->name, sizeof(img->name), "/boot/%s", filename);
+
+                    if (ventoy_find_initrd_by_name(g_initrd_img_list, img->name))
+                    {
+                        grub_free(img);
+                    }
+                    else
+                    {                        
+                        if (g_initrd_img_list)
+                        {
+                            img->prev = g_initrd_img_tail;
+                            g_initrd_img_tail->next = img;
+                        }
+                        else
+                        {
+                            g_initrd_img_list = img;
+                        }
+
+                        g_initrd_img_tail = img;
+                        g_initrd_img_count++;
+                    }
+                }
+            }
+        }
+    }
+
+    return 0;
+}
+
+static int ventoy_linux_collect_boot_initrds(void)
+{
+    grub_fs_t fs;
+    grub_device_t dev = NULL;
+
+    dev = grub_device_open("loop");
+    if (!dev)
+    {
+        debug("failed to open device loop\n");
+        goto end;        
+    }
+
+    fs = grub_fs_probe(dev);
+    if (!fs)
+    {
+        debug("failed to probe fs %d\n", grub_errno);
+        goto end;
+    }
+
+    fs->fs_dir(dev, "/boot", ventoy_linux_initrd_collect_hook, NULL);
+
+end:
+    return 0;    
+}
+
 static grub_err_t ventoy_grub_cfg_initrd_collect(const char *fileName)
 {
     int i = 0;
     int len = 0;
     int dollar = 0;
     int quotation = 0;
+    int initrd_dollar = 0;
     grub_file_t file = NULL;
     char *buf = NULL;
     char *start = NULL;
@@ -421,6 +493,19 @@ static grub_err_t ventoy_grub_cfg_initrd_collect(const char *fileName)
                 debug("Remove quotation <%s>\n", img->name);
             }
 
+            /* special process for /boot/initrd$XXX.img */
+            if (dollar == 1)
+            {
+                if (grub_strncmp(img->name, "/boot/initrd$", 13) == 0)
+                {
+                    len = (int)grub_strlen(img->name);
+                    if (grub_strcmp(img->name + len - 4, ".img") == 0)
+                    {
+                        initrd_dollar++;                        
+                    }                    
+                }
+            }
+
             if (dollar == 1 || ventoy_find_initrd_by_name(g_initrd_img_list, img->name))
             {
                 grub_free(img);
@@ -458,6 +543,12 @@ static grub_err_t ventoy_grub_cfg_initrd_collect(const char *fileName)
     grub_free(buf);
     grub_file_close(file);
 
+    if (initrd_dollar > 0 && grub_strncmp(fileName, "(loop)/", 7) == 0)
+    {
+        debug("collect initrd variable %d\n", initrd_dollar);
+        ventoy_linux_collect_boot_initrds();
+    }
+
     VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
 
@@ -654,11 +745,18 @@ int ventoy_cpio_newc_fill_head(void *buf, int filesize, const void *filedata, co
 
 static grub_uint32_t ventoy_linux_get_virt_chunk_count(void)
 {
+    int i;
     grub_uint32_t count = g_valid_initrd_count;
     
-    if (g_conf_replace_offset > 0)
+    if (g_conf_replace_count > 0)
     {
-        count++;
+        for (i = 0; i < g_conf_replace_count; i++)
+        {
+            if (g_conf_replace_offset[i] > 0)
+            {
+                count++;
+            }
+        }
     }
     
     if (g_append_ext_sector > 0)
@@ -671,13 +769,20 @@ static grub_uint32_t ventoy_linux_get_virt_chunk_count(void)
 
 static grub_uint32_t ventoy_linux_get_virt_chunk_size(void)
 {
+    int i;
     grub_uint32_t size;
     
     size = (sizeof(ventoy_virt_chunk) + g_ventoy_cpio_size) * g_valid_initrd_count;
-    
-    if (g_conf_replace_offset > 0)
+
+    if (g_conf_replace_count > 0)
     {
-        size += sizeof(ventoy_virt_chunk) + g_conf_replace_new_len_align;
+        for (i = 0; i < g_conf_replace_count; i++)
+        {
+            if (g_conf_replace_offset[i] > 0)
+            {
+                size += sizeof(ventoy_virt_chunk) + g_conf_replace_new_len_align[i];
+            }
+        }
     }
     
     if (g_append_ext_sector > 0)
@@ -690,6 +795,7 @@ static grub_uint32_t ventoy_linux_get_virt_chunk_size(void)
 
 static void ventoy_linux_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_head *chain)
 {
+    int i = 0;
     int id = 0;
     int virtid = 0;
     initrd_info *node;
@@ -699,6 +805,7 @@ static void ventoy_linux_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_
     grub_uint32_t initrd_secs;
     char *override;
     ventoy_virt_chunk *cur;
+    ventoy_grub_param_file_replace *replace = NULL;
     char name[32];
 
     override = (char *)chain + chain->virt_chunk_offset;
@@ -764,30 +871,37 @@ static void ventoy_linux_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_
         virtid++;
     }
 
-    if (g_conf_replace_offset > 0)
+    if (g_conf_replace_count > 0)
     {
-        cpio_secs = g_conf_replace_new_len_align / 2048;
-    
-        cur->mem_sector_start   = sector;
-        cur->mem_sector_end     = cur->mem_sector_start + cpio_secs;
-        cur->mem_sector_offset  = offset;
-        cur->remap_sector_start = 0;
-        cur->remap_sector_end   = 0;
-        cur->org_sector_start   = 0;
-
-        grub_memcpy(override + offset, g_conf_replace_new_buf, g_conf_replace_new_len);
-
-        chain->virt_img_size_in_bytes += g_conf_replace_new_len_align;
-
-        if (g_grub_param->img_replace.magic == GRUB_IMG_REPLACE_MAGIC)
+        for (i = 0; i < g_conf_replace_count; i++)
         {
-            g_grub_param->img_replace.new_file_virtual_id = virtid;
-        }
+            if (g_conf_replace_offset[i] > 0)
+            {
+                cpio_secs = g_conf_replace_new_len_align[i] / 2048;
+            
+                cur->mem_sector_start   = sector;
+                cur->mem_sector_end     = cur->mem_sector_start + cpio_secs;
+                cur->mem_sector_offset  = offset;
+                cur->remap_sector_start = 0;
+                cur->remap_sector_end   = 0;
+                cur->org_sector_start   = 0;
 
-        offset += g_conf_replace_new_len_align;
-        sector += cpio_secs;
-        cur++;
-        virtid++;
+                grub_memcpy(override + offset, g_conf_replace_new_buf[i], g_conf_replace_new_len[i]);
+
+                chain->virt_img_size_in_bytes += g_conf_replace_new_len_align[i];
+
+                replace = g_grub_param->img_replace + i;
+                if (replace->magic == GRUB_IMG_REPLACE_MAGIC)
+                {
+                    replace->new_file_virtual_id = virtid;
+                }
+
+                offset += g_conf_replace_new_len_align[i];
+                sector += cpio_secs;
+                cur++;
+                virtid++;
+            }
+        }
     }
 
     return;
@@ -795,11 +909,18 @@ static void ventoy_linux_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_
 
 static grub_uint32_t ventoy_linux_get_override_chunk_count(void)
 {
+    int i;
     grub_uint32_t count = g_valid_initrd_count;
-    
-    if (g_conf_replace_offset > 0)
+
+    if (g_conf_replace_count > 0)
     {
-        count++;
+        for (i = 0; i < g_conf_replace_count; i++)
+        {
+            if (g_conf_replace_offset[i] > 0)
+            {
+                count++;
+            }
+        }
     }
 
     if (g_svd_replace_offset > 0)
@@ -812,11 +933,18 @@ static grub_uint32_t ventoy_linux_get_override_chunk_count(void)
 
 static grub_uint32_t ventoy_linux_get_override_chunk_size(void)
 {
+    int i;
     int count = g_valid_initrd_count;
-    
-    if (g_conf_replace_offset > 0)
+
+    if (g_conf_replace_count > 0)
     {
-        count++;
+        for (i = 0; i < g_conf_replace_count; i++)
+        {
+            if (g_conf_replace_offset[i] > 0)
+            {
+                count++;
+            }
+        }
     }
 
     if (g_svd_replace_offset > 0)
@@ -829,6 +957,7 @@ static grub_uint32_t ventoy_linux_get_override_chunk_size(void)
 
 static void ventoy_linux_fill_override_data(    grub_uint64_t isosize, void *override)
 {
+    int i;
     initrd_info *node;
     grub_uint32_t mod;
     grub_uint32_t newlen;
@@ -883,23 +1012,29 @@ static void ventoy_linux_fill_override_data(    grub_uint64_t isosize, void *ove
         cur++;
     }
 
-    if (g_conf_replace_offset > 0)
-    {        
-        cur->img_offset = g_conf_replace_offset;
-        cur->override_size = sizeof(ventoy_iso9660_override);
+    if (g_conf_replace_count > 0)
+    {
+        for (i = 0; i < g_conf_replace_count; i++)
+        {
+            if (g_conf_replace_offset[i] > 0)
+            {        
+                cur->img_offset = g_conf_replace_offset[i];
+                cur->override_size = sizeof(ventoy_iso9660_override);
 
-        newlen = (grub_uint32_t)(g_conf_replace_new_len);
+                newlen = (grub_uint32_t)(g_conf_replace_new_len[i]);
 
-        dirent = (ventoy_iso9660_override *)cur->override_data;
-        dirent->first_sector    = (grub_uint32_t)sector;
-        dirent->size            = newlen;
-        dirent->first_sector_be = grub_swap_bytes32(dirent->first_sector);
-        dirent->size_be         = grub_swap_bytes32(dirent->size);
+                dirent = (ventoy_iso9660_override *)cur->override_data;
+                dirent->first_sector    = (grub_uint32_t)sector;
+                dirent->size            = newlen;
+                dirent->first_sector_be = grub_swap_bytes32(dirent->first_sector);
+                dirent->size_be         = grub_swap_bytes32(dirent->size);
 
-        sector += (dirent->size + 2047) / 2048;
-        cur++;
+                sector += (dirent->size + 2047) / 2048;
+                cur++;
+            }
+        }
     }
-    
+
     if (g_svd_replace_offset > 0)
     {        
         cur->img_offset = g_svd_replace_offset;
@@ -1211,6 +1346,7 @@ grub_err_t ventoy_cmd_load_cpio(grub_extcmd_context_t ctxt, int argc, char **arg
     grub_file_t file;
     grub_file_t archfile;
     grub_file_t tmpfile;
+    install_template *template_node = NULL;
     ventoy_img_chunk_list chunk_list;
 
     (void)ctxt;
@@ -1257,26 +1393,17 @@ grub_err_t ventoy_cmd_load_cpio(grub_extcmd_context_t ctxt, int argc, char **arg
         persistent_buf = (char *)(chunk_list.chunk);
     }
 
-    template_file = ventoy_plugin_get_cur_install_template(args[1]);
+    template_file = ventoy_plugin_get_cur_install_template(args[1], &template_node);
     if (template_file)
     {
-        debug("auto install template: <%s>\n", template_file);
-        tmpfile = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s%s", args[2], template_file);
-        if (tmpfile)
+        debug("auto install template: <%s> <addr:%p> <len:%d>\n", 
+            template_file, template_node->filebuf, template_node->filelen);
+        
+        template_size = template_node->filelen;
+        template_buf = grub_malloc(template_size);
+        if (template_buf)
         {
-            debug("auto install script size %d\n", (int)tmpfile->size);
-            template_size = tmpfile->size;
-            template_buf = grub_malloc(template_size);
-            if (template_buf)
-            {
-                grub_file_read(tmpfile, template_buf, template_size);
-            }
-
-            grub_file_close(tmpfile);
-        }
-        else
-        {
-            debug("Failed to open install script %s%s\n", args[2], template_file);
+            grub_memcpy(template_buf, template_node->filebuf, template_size);
         }
     }
     else
@@ -1363,15 +1490,14 @@ grub_err_t ventoy_cmd_load_cpio(grub_extcmd_context_t ctxt, int argc, char **arg
     {
         headlen = ventoy_cpio_newc_fill_head(buf, template_size, template_buf, "ventoy/autoinstall");
         buf += headlen + ventoy_align(template_size, 4);
+        grub_check_free(template_buf);
     }
 
     if (persistent_size > 0 && persistent_buf)
     {
         headlen = ventoy_cpio_newc_fill_head(buf, persistent_size, persistent_buf, "ventoy/ventoy_persistent_map");
         buf += headlen + ventoy_align(persistent_size, 4);
-
-        grub_free(persistent_buf);
-        persistent_buf = NULL;
+        grub_check_free(persistent_buf);
     }
 
     if (injection_size > 0 && injection_buf)
@@ -1623,10 +1749,10 @@ grub_err_t ventoy_cmd_linux_chain_data(grub_extcmd_context_t ctxt, int argc, cha
         }
     }
 
-    chain = grub_malloc(size);
+    chain = ventoy_alloc_chain(size);
     if (!chain)
     {
-        grub_printf("Failed to alloc chain memory size %u\n", size);
+        grub_printf("Failed to alloc chain linux memory size %u\n", size);
         grub_file_close(file);
         return 1;
     }
@@ -1685,3 +1811,173 @@ grub_err_t ventoy_cmd_linux_chain_data(grub_extcmd_context_t ctxt, int argc, cha
     VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
 
+static char *ventoy_systemd_conf_tag(char *buf, const char *tag, int optional)
+{
+    int taglen = 0;
+    char *start = NULL;
+    char *nextline = NULL;
+
+    taglen = grub_strlen(tag);
+    for (start = buf; start; start = nextline)
+    {
+        nextline = ventoy_get_line(start);
+        while (ventoy_isspace(*start))
+        {
+            start++;
+        }
+
+        if (grub_strncmp(start, tag, taglen) == 0 && (start[taglen] == ' ' || start[taglen] == '\t'))
+        {
+            start += taglen;
+            while (ventoy_isspace(*start))
+            {
+                start++;
+            } 
+            return start;
+        }
+    }
+
+    if (optional == 0)
+    {
+        debug("tag<%s> NOT found\n", tag);        
+    }
+    return NULL;
+}
+
+static int ventoy_systemd_conf_hook(const char *filename, const struct grub_dirhook_info *info, void *data)
+{
+    int oldpos = 0;
+    char *tag = NULL;
+    char *bkbuf = NULL;
+    char *filebuf = NULL;
+    grub_file_t file = NULL;
+    systemd_menu_ctx *ctx = (systemd_menu_ctx *)data;
+
+    debug("ventoy_systemd_conf_hook %s\n", filename);
+
+    if (info->dir || NULL == grub_strstr(filename, ".conf"))
+    {
+        return 0;
+    }
+
+
+    file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s/loader/entries/%s", ctx->dev, filename);
+    if (!file)
+    {
+        return 0;
+    }
+
+    filebuf = grub_zalloc(2 * file->size + 8);
+    if (!filebuf)
+    {
+        goto out;
+    }
+
+    bkbuf = filebuf + file->size + 4;
+    grub_file_read(file, bkbuf, file->size);
+
+    oldpos = ctx->pos;
+
+    /* title --> menuentry */
+    grub_memcpy(filebuf, bkbuf, file->size);
+    tag = ventoy_systemd_conf_tag(filebuf, "title", 0);
+    vtoy_check_goto_out(tag);
+    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "menuentry \"%s\" {\n", tag);
+
+    /* linux xxx */
+    grub_memcpy(filebuf, bkbuf, file->size);
+    tag = ventoy_systemd_conf_tag(filebuf, "linux", 0);
+    if (!tag)
+    {
+        ctx->pos = oldpos;
+        goto out;
+    }
+    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "  echo \"Downloading kernel ...\"\n  linux %s ", tag);
+
+    /* kernel options */
+    grub_memcpy(filebuf, bkbuf, file->size);
+    tag = ventoy_systemd_conf_tag(filebuf, "options", 0);
+    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "%s \n", tag ? tag : "");
+
+    
+    /* initrd xxx xxx xxx */
+    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "  echo \"Downloading initrd ...\"\n  initrd ");
+    grub_memcpy(filebuf, bkbuf, file->size);
+    tag = ventoy_systemd_conf_tag(filebuf, "initrd", 1);
+    while (tag)
+    {
+        vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "%s ", tag);
+        tag = ventoy_systemd_conf_tag(tag + grub_strlen(tag) + 1, "initrd", 1);
+    }
+
+    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "\n  boot\n}\n");
+
+out:
+    grub_check_free(filebuf);
+    grub_file_close(file);
+    return 0;
+}
+
+grub_err_t ventoy_cmd_linux_systemd_menu(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    static char *buf = NULL;
+    char name[128];
+    char value[64];
+    grub_fs_t fs;
+    char *device_name = NULL;
+    grub_device_t dev = NULL;
+    systemd_menu_ctx ctx;
+    
+    (void)ctxt;
+    (void)argc;
+
+    if (!buf)
+    {
+        buf = grub_malloc(VTOY_LINUX_SYSTEMD_MENU_MAX_BUF);
+        if (!buf)
+        {
+            goto end;
+        }        
+    }
+
+    device_name = grub_file_get_device_name(args[0]);
+    if (!device_name)
+    {
+        debug("failed to get device name %s\n", args[0]);
+        goto end;
+    }
+
+    dev = grub_device_open(device_name);
+    if (!dev)
+    {
+        debug("failed to open device %s\n", device_name);
+        goto end;        
+    }
+
+    fs = grub_fs_probe(dev);
+    if (!fs)
+    {
+        debug("failed to probe fs %d\n", grub_errno);
+        goto end;
+    }
+
+    ctx.dev = args[0];
+    ctx.buf = buf;
+    ctx.pos = 0;
+    ctx.len = VTOY_LINUX_SYSTEMD_MENU_MAX_BUF;
+    fs->fs_dir(dev, "/loader/entries", ventoy_systemd_conf_hook, &ctx);
+
+    grub_snprintf(name, sizeof(name), "%s_addr", args[1]);
+    grub_snprintf(value, sizeof(value), "0x%llx", (ulonglong)(ulong)buf);
+    grub_env_set(name, value);
+    
+    grub_snprintf(name, sizeof(name), "%s_size", args[1]);
+    grub_snprintf(value, sizeof(value), "%d", ctx.pos);
+    grub_env_set(name, value);
+
+end:
+    grub_check_free(device_name);
+    check_free(dev, grub_device_close);
+    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
+}
+

GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c

@@ -2641,10 +2641,15 @@ install_template * ventoy_plugin_find_install_template(const char *isopath)
     return NULL;
 }
 
-char * ventoy_plugin_get_cur_install_template(const char *isopath)
+char * ventoy_plugin_get_cur_install_template(const char *isopath, install_template **cur)
 {
     install_template *node = NULL;
 
+    if (cur)
+    {
+        *cur = NULL;
+    }
+
     node = ventoy_plugin_find_install_template(isopath);
     if ((!node) || (!node->templatepath))
     {
@@ -2656,6 +2661,11 @@ char * ventoy_plugin_get_cur_install_template(const char *isopath)
         return NULL;
     }
 
+    if (cur)
+    {
+        *cur = node;
+    }
+
     return node->templatepath[node->cursel].path;
 }
 
@@ -3044,14 +3054,15 @@ int ventoy_plugin_get_image_list_index(int type, const char *name)
     return 0;
 }
 
-conf_replace * ventoy_plugin_find_conf_replace(const char *iso)
+int ventoy_plugin_find_conf_replace(const char *iso, conf_replace *nodes[VTOY_MAX_CONF_REPLACE])
 {
+    int n = 0;
     int len;
     conf_replace *node;
 
     if (!g_conf_replace_head)
     {
-        return NULL;
+        return 0;
     }
 
     len = (int)grub_strlen(iso);
@@ -3060,11 +3071,15 @@ conf_replace * ventoy_plugin_find_conf_replace(const char *iso)
     {
         if (node->pathlen == len && ventoy_strncmp(node->isopath, iso, len) == 0)
         {
-            return node;
+            nodes[n++] = node;
+            if (n >= VTOY_MAX_CONF_REPLACE)
+            {
+                return n;
+            }
         }
     }
     
-    return NULL;
+    return n;
 }
 
 dud * ventoy_plugin_find_dud(const char *iso)

GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_unix.c

@@ -445,12 +445,16 @@ grub_err_t ventoy_cmd_parse_freenas_ver(grub_extcmd_context_t ctxt, int argc, ch
     ver = vtoy_json_get_string_ex(json->pstChild, "Version");
     if (ver)
     {
-        debug("freenas version:<%s>\n", ver);
+        debug("NAS version:<%s>\n", ver);
+        if (grub_strncmp(ver, "TrueNAS-", 8) == 0)
+        {
+            ver += 8;
+        }
         ventoy_set_env(args[1], ver);
     }
     else
     {
-        debug("freenas version:<%s>\n", "NOT FOUND");
+        debug("NAS version:<%s>\n", "NOT FOUND");
         grub_env_unset(args[1]);
     }
 
@@ -1185,10 +1189,10 @@ grub_err_t ventoy_cmd_unix_chain_data(grub_extcmd_context_t ctxt, int argc, char
         }
     }
 
-    chain = grub_malloc(size);
+    chain = ventoy_alloc_chain(size);
     if (!chain)
     {
-        grub_printf("Failed to alloc chain memory size %u\n", size);
+        grub_printf("Failed to alloc chain unix memory size %u\n", size);
         grub_file_close(file);
         return 1;
     }

GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_vhd.c

@@ -687,10 +687,10 @@ grub_err_t ventoy_cmd_raw_chain_data(grub_extcmd_context_t ctxt, int argc, char
         }
     }
 
-    chain = grub_malloc(size);
+    chain = ventoy_alloc_chain(size);
     if (!chain)
     {
-        grub_printf("Failed to alloc chain memory size %u\n", size);
+        grub_printf("Failed to alloc chain raw memory size %u\n", size);
         grub_file_close(file);
         return 1;
     }

GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_windows.c

@@ -1015,7 +1015,7 @@ static int ventoy_update_all_hash(wim_patch *patch, void *meta_data, wim_directo
     return 0;
 }
 
-static int ventoy_cat_exe_file_data(wim_tail *wim_data, grub_uint32_t exe_len, grub_uint8_t *exe_data)
+static int ventoy_cat_exe_file_data(wim_tail *wim_data, grub_uint32_t exe_len, grub_uint8_t *exe_data, int windatalen)
 {
     int pe64 = 0;
     char file[256];
@@ -1030,14 +1030,14 @@ static int ventoy_cat_exe_file_data(wim_tail *wim_data, grub_uint32_t exe_len, g
     jump_align = ventoy_align(jump_len, 16);
     
     wim_data->jump_exe_len = jump_len;
-    wim_data->bin_raw_len = jump_align + sizeof(ventoy_os_param) + sizeof(ventoy_windows_data) + exe_len;
+    wim_data->bin_raw_len = jump_align + sizeof(ventoy_os_param) + windatalen + exe_len;
     wim_data->bin_align_len = ventoy_align(wim_data->bin_raw_len, 2048);
     
     wim_data->jump_bin_data = grub_malloc(wim_data->bin_align_len);
     if (wim_data->jump_bin_data)
     {
         grub_memcpy(wim_data->jump_bin_data, jump_data, jump_len);
-        grub_memcpy(wim_data->jump_bin_data + jump_align + sizeof(ventoy_os_param) + sizeof(ventoy_windows_data), exe_data, exe_len);
+        grub_memcpy(wim_data->jump_bin_data + jump_align + sizeof(ventoy_os_param) + windatalen, exe_data, exe_len);
     }
 
     debug("jump_exe_len:%u bin_raw_len:%u bin_align_len:%u\n", 
@@ -1046,26 +1046,68 @@ static int ventoy_cat_exe_file_data(wim_tail *wim_data, grub_uint32_t exe_len, g
     return 0;
 }
 
-int ventoy_fill_windows_rtdata(void *buf, char *isopath)
+static int ventoy_get_windows_rtdata_len(const char *iso, int *flag)
 {
+    int size = 0;
+    int template_file_len = 0;
     char *pos = NULL;
     char *script = NULL;
+    install_template *template_node = NULL;
+
+    *flag = 0;
+    size = (int)sizeof(ventoy_windows_data);
+    
+    pos = grub_strstr(iso, "/");
+    if (!pos)
+    {
+        return size;
+    }
+    
+    script = ventoy_plugin_get_cur_install_template(pos, &template_node);
+    if (script)
+    {
+        (*flag) |= WINDATA_FLAG_TEMPLATE;
+        template_file_len = template_node->filelen;
+    }
+
+    return size + template_file_len;
+}
+
+static int ventoy_fill_windows_rtdata(void *buf, char *isopath, int dataflag)
+{
+    int template_len = 0;
+    char *pos = NULL;
+    char *end = NULL;
+    char *script = NULL;
     const char *env = NULL;
+    install_template *template_node = NULL;
     ventoy_windows_data *data = (ventoy_windows_data *)buf;
 
     grub_memset(data, 0, sizeof(ventoy_windows_data));
 
+    env = grub_env_get("VTOY_WIN11_BYPASS_CHECK");
+    if (env && env[0] == '1' && env[1] == 0)
+    {
+        data->windows11_bypass_check = 1;
+    }
+
     pos = grub_strstr(isopath, "/");
     if (!pos)
     {
         return 1;
     }
 
-    script = ventoy_plugin_get_cur_install_template(pos);
-    if (script)
+    if (dataflag & WINDATA_FLAG_TEMPLATE)
     {
-        debug("auto install script <%s>\n", script);
-        grub_snprintf(data->auto_install_script, sizeof(data->auto_install_script) - 1, "%s", script);
+        script = ventoy_plugin_get_cur_install_template(pos, &template_node);
+        if (script)
+        {
+            data->auto_install_len = template_len = template_node->filelen;
+            debug("auto install script OK <%s> <len:%d>\n", script, template_len);
+            end = ventoy_str_last(script, '/');
+            grub_snprintf(data->auto_install_script, sizeof(data->auto_install_script) - 1, "%s", end ? end + 1 : script);
+            grub_memcpy(data + 1, template_node->filebuf, template_len);
+        }
     }
     else
     {
@@ -1090,12 +1132,6 @@ int ventoy_fill_windows_rtdata(void *buf, char *isopath)
         debug("injection archive not configed %s\n", pos);
     }
 
-    env = grub_env_get("VTOY_WIN11_BYPASS_CHECK");
-    if (env && env[0] == '1' && env[1] == 0)
-    {
-        data->windows11_bypass_check = 1;
-    }
-
     return 0;
 }
 
@@ -1125,7 +1161,7 @@ static int ventoy_update_before_chain(ventoy_os_param *param, char *isopath)
         if (wim_data->jump_bin_data)
         {
             grub_memcpy(wim_data->jump_bin_data + jump_align, param, sizeof(ventoy_os_param));        
-            ventoy_fill_windows_rtdata(wim_data->jump_bin_data + jump_align + sizeof(ventoy_os_param), isopath);
+            ventoy_fill_windows_rtdata(wim_data->jump_bin_data + jump_align + sizeof(ventoy_os_param), isopath, wim_data->windata_flag);
         }
 
         grub_crypto_hash(GRUB_MD_SHA1, wim_data->bin_hash.sha1, wim_data->jump_bin_data, wim_data->bin_raw_len);
@@ -1168,7 +1204,7 @@ static int ventoy_update_before_chain(ventoy_os_param *param, char *isopath)
     return 0;
 }
 
-static int ventoy_wimdows_locate_wim(const char *disk, wim_patch *patch)
+static int ventoy_wimdows_locate_wim(const char *disk, wim_patch *patch, int windatalen)
 {
     int rc;
     grub_uint16_t i;
@@ -1285,7 +1321,7 @@ static int ventoy_wimdows_locate_wim(const char *disk, wim_patch *patch)
 
         if (0 == ventoy_read_resource(file, head, &(patch->replace_look->resource), (void **)&(exe_data)))
         {
-            ventoy_cat_exe_file_data(wim_data, exe_len, exe_data);
+            ventoy_cat_exe_file_data(wim_data, exe_len, exe_data, windatalen);
             grub_free(exe_data);
         }
         else
@@ -1328,17 +1364,126 @@ static int ventoy_wimdows_locate_wim(const char *disk, wim_patch *patch)
     return 0;
 }
 
+grub_err_t ventoy_cmd_sel_winpe_wim(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    int i = 0;
+    int pos = 0;
+    int len = 0;
+    int find = 0;
+    char *cmd = NULL;
+    wim_patch *node = NULL;
+    wim_patch *tmp = NULL;
+    grub_file_t file = NULL;
+    wim_header *head = NULL;
+    char cfgfile[128];
+
+    (void)ctxt;
+    (void)argc;
+
+    len = 8 * VTOY_SIZE_1KB;
+    cmd = (char *)grub_malloc(len + sizeof(wim_header));
+    if (!cmd)
+    {
+        return 1;
+    }
+
+    head = (wim_header *)(cmd + len);
+    grub_env_unset("vtoy_pe_wim_path");
+
+    for (node = g_wim_patch_head; node; node = node->next)
+    {
+        find = 0;
+        for (tmp = g_wim_patch_head; tmp != node; tmp = tmp->next)
+        {
+            if (tmp->valid && grub_strcasecmp(tmp->path, node->path) == 0)
+            {
+                find = 1;
+                break;
+            }
+        }
+
+        if (find)
+        {
+            continue;
+        }
+        
+        g_ventoy_case_insensitive = 1;
+        file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s%s", args[0], node->path);
+        g_ventoy_case_insensitive = 0;
+        if (!file)
+        {
+            debug("File %s%s NOT exist\n", args[0], node->path);
+            continue;
+        }
+
+        grub_file_read(file, head, sizeof(wim_header));
+        if (grub_memcmp(head->signature, WIM_HEAD_SIGNATURE, sizeof(head->signature)))
+        {
+            debug("Not a valid wim file %s\n", (char *)head->signature);
+            grub_file_close(file);
+            continue;
+        }
+
+        if (head->flags & FLAG_HEADER_COMPRESS_LZMS)
+        {
+            debug("LZMS compress is not supported 0x%x\n", head->flags);
+            grub_file_close(file);
+            continue;
+        }
+
+        grub_file_close(file);
+        node->valid = 1;
+
+        vtoy_len_ssprintf(cmd, pos, len, "menuentry \"%s\" --class=\"sel_wim\"  {\n  echo \"\"\n}\n", node->path);
+    }
+
+    if (pos > 0)
+    {
+        g_ventoy_menu_esc = 1;
+        g_ventoy_suppress_esc = 1;
+        g_ventoy_suppress_esc_default = 0;
+
+        grub_snprintf(cfgfile, sizeof(cfgfile), "configfile mem:0x%llx:size:%d", (ulonglong)(ulong)cmd, pos);
+        grub_script_execute_sourcecode(cfgfile);   
+
+        g_ventoy_menu_esc = 0;
+        g_ventoy_suppress_esc = 0;
+        g_ventoy_suppress_esc_default = 1;
+
+        for (node = g_wim_patch_head; node; node = node->next)
+        {
+            if (node->valid)
+            {
+                if (i == g_ventoy_last_entry)
+                {
+                    grub_env_set("vtoy_pe_wim_path", node->path);
+                    break;
+                }
+                i++;
+            }
+        }
+    }
+
+    grub_free(cmd);
+    return 0;
+}
+
 grub_err_t ventoy_cmd_locate_wim_patch(grub_extcmd_context_t ctxt, int argc, char **args)
 {
+    int datalen = 0;
+    int dataflag = 0;
     wim_patch *node = g_wim_patch_head;
 
     (void)ctxt;
     (void)argc;
     (void)args;
 
+    datalen = ventoy_get_windows_rtdata_len(args[1], &dataflag);
+
     while (node)
     {
-        if (0 == ventoy_wimdows_locate_wim(args[0], node))
+        node->wim_data.windata_flag = dataflag;
+        if (0 == ventoy_wimdows_locate_wim(args[0], node, datalen))
         {
             node->valid = 1;
             g_wim_valid_patch_count++;
@@ -1749,17 +1894,151 @@ end:
     return rc;
 }
 
+static int ventoy_extract_init_exe(char *wimfile, grub_uint8_t **pexe_data, grub_uint32_t *pexe_len, char *exe_name)
+{
+    int rc;
+    int ret = 1;
+    grub_uint16_t i;
+    grub_file_t file = NULL;
+    grub_uint32_t exe_len = 0;
+    wim_header *head = NULL;
+    grub_uint16_t *uname = NULL;
+    grub_uint8_t *exe_data = NULL;
+    grub_uint8_t *decompress_data = NULL;
+    wim_lookup_entry *lookup = NULL;
+    wim_security_header *security = NULL;
+    wim_directory_entry *rootdir = NULL;
+    wim_directory_entry *search = NULL;
+    wim_stream_entry *stream = NULL;
+    wim_lookup_entry *replace_look = NULL;
+    wim_header wimhdr;
+    wim_hash hashdata;
+
+    head = &wimhdr;
+
+    file = grub_file_open(wimfile, VENTOY_FILE_TYPE);
+    if (!file)
+    {
+        goto out;
+    }
+
+    grub_file_read(file, head, sizeof(wim_header));
+    rc = ventoy_read_resource(file, head, &head->metadata, (void **)&decompress_data);
+    if (rc)
+    {
+        grub_printf("failed to read meta data %d\n", rc);
+        goto out;
+    }
+
+    security = (wim_security_header *)decompress_data;
+    if (security->len > 0)
+    {
+        rootdir = (wim_directory_entry *)(decompress_data + ((security->len + 7) & 0xFFFFFFF8U));
+    }
+    else
+    {
+        rootdir = (wim_directory_entry *)(decompress_data + 8);
+    }
+
+    debug("read lookup offset:%llu size:%llu\n", (ulonglong)head->lookup.offset, (ulonglong)head->lookup.raw_size);
+    lookup = grub_malloc(head->lookup.raw_size);
+    grub_file_seek(file, head->lookup.offset);
+    grub_file_read(file, lookup, head->lookup.raw_size);
+
+    /* search winpeshl.exe dirent entry */
+    search = search_replace_wim_dirent(file, head, lookup, decompress_data, rootdir);
+    if (!search)
+    {
+        debug("Failed to find replace file %p\n", search);
+        goto out;
+    }
+    
+    uname = (grub_uint16_t *)(search + 1);
+    for (i = 0; i < search->name_len / 2 && i < 200; i++)
+    {
+        exe_name[i] = (char)uname[i];
+    }
+    exe_name[i] = 0;
+    debug("find replace file at %p <%s>\n", search, exe_name);
+
+    grub_memset(&hashdata, 0, sizeof(wim_hash));
+    if (grub_memcmp(&hashdata, search->hash.sha1, sizeof(wim_hash)) == 0)
+    {
+        debug("search hash all 0, now do deep search\n");
+        stream = (wim_stream_entry *)((char *)search + search->len);
+        for (i = 0; i < search->streams; i++)
+        {
+            if (stream->name_len == 0)
+            {
+                grub_memcpy(&hashdata, stream->hash.sha1, sizeof(wim_hash));
+                debug("new search hash: %02x %02x %02x %02x %02x %02x %02x %02x\n", 
+                    ventoy_varg_8(hashdata.sha1));
+                break;
+            }
+            stream = (wim_stream_entry *)((char *)stream + stream->len);
+        }
+    }
+    else
+    {
+        grub_memcpy(&hashdata, search->hash.sha1, sizeof(wim_hash));        
+    }
+
+    /* find and extact winpeshl.exe */
+    replace_look = ventoy_find_look_entry(head, lookup, &hashdata);
+    if (replace_look)
+    {
+        exe_len = (grub_uint32_t)replace_look->resource.raw_size;
+        debug("find replace lookup entry_id:%ld raw_size:%u\n", 
+            ((long)replace_look - (long)lookup) / sizeof(wim_lookup_entry), exe_len);
+
+        if (0 != ventoy_read_resource(file, head, &(replace_look->resource), (void **)&(exe_data)))
+        {
+            exe_len = 0;
+            exe_data = NULL;
+            debug("failed to read replace file meta data %u\n", exe_len);
+        }
+    }
+    else
+    {
+        debug("failed to find lookup entry for replace file %02x %02x %02x %02x\n", 
+            ventoy_varg_4(hashdata.sha1));
+    }
+
+    if (exe_data)
+    {
+        ret = 0;
+        *pexe_data = exe_data;
+        *pexe_len = exe_len;
+    }
+    
+out:
+
+    grub_check_free(lookup);
+    grub_check_free(decompress_data);
+    check_free(file, grub_file_close);
+
+    return ret;
+}
+
 grub_err_t ventoy_cmd_windows_wimboot_data(grub_extcmd_context_t ctxt, int argc, char **args)
 {
-    grub_uint32_t size = 0;
+    int rc = 0;
+    int wim64 = 0;
+    int datalen = 0;
+    int dataflag = 0;
+    grub_uint32_t exe_len = 0;
+    grub_uint32_t jump_align = 0;
     const char *addr = NULL;
     ventoy_chain_head *chain = NULL;
-    ventoy_os_param *param = NULL;
-    char envbuf[64];
+    grub_uint8_t *param = NULL;
+    grub_uint8_t *exe_data = NULL;
+    ventoy_windows_data *rtdata = NULL;
+    char envbuf[64] = {0};
+    char exename[128] = {0};
+    wim_tail wim_data;
 
     (void)ctxt;
     (void)argc;
-    (void)args;
 
     addr = grub_env_get("vtoy_chain_mem_addr");
     if (!addr)
@@ -1776,24 +2055,38 @@ grub_err_t ventoy_cmd_windows_wimboot_data(grub_extcmd_context_t ctxt, int argc,
         return 1;
     }
 
-    size = sizeof(ventoy_os_param) + sizeof(ventoy_windows_data);
-    param = (ventoy_os_param *)grub_zalloc(size);
-    if (!param)
+    datalen = ventoy_get_windows_rtdata_len(chain->os_param.vtoy_img_path, &dataflag);
+
+    rc = ventoy_extract_init_exe(args[0], &exe_data, &exe_len, exename);
+    if (rc)
     {
         return 1;
     }
+    wim64 = ventoy_is_pe64(exe_data);
 
-    grub_memcpy(param, &chain->os_param, sizeof(ventoy_os_param));
-    ventoy_fill_windows_rtdata(param + 1, param->vtoy_img_path);
+    grub_memset(&wim_data, 0, sizeof(wim_data));
+    ventoy_cat_exe_file_data(&wim_data, exe_len, exe_data, datalen);
+    grub_check_free(exe_data);
 
-    grub_snprintf(envbuf, sizeof(envbuf), "0x%lx", (unsigned long)param);
+    jump_align = ventoy_align(wim_data.jump_exe_len, 16);
+    param = wim_data.jump_bin_data;
+
+    grub_memcpy(param + jump_align, &chain->os_param, sizeof(ventoy_os_param));
+
+    rtdata = (ventoy_windows_data *)(param + jump_align + sizeof(ventoy_os_param));
+    ventoy_fill_windows_rtdata(rtdata, chain->os_param.vtoy_img_path, dataflag);
+
+    grub_snprintf(envbuf, sizeof(envbuf), "0x%lx", (ulong)param);
     grub_env_set("vtoy_wimboot_mem_addr", envbuf);
     debug("vtoy_wimboot_mem_addr: %s\n", envbuf);
     
-    grub_snprintf(envbuf, sizeof(envbuf), "%u", size);
+    grub_snprintf(envbuf, sizeof(envbuf), "%u", wim_data.bin_align_len);
     grub_env_set("vtoy_wimboot_mem_size", envbuf);
     debug("vtoy_wimboot_mem_size: %s\n", envbuf);
-    
+
+    grub_env_set(args[1], exename);
+    grub_env_set(args[2], wim64 ? "64" : "32");
+
     VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
 
@@ -1834,7 +2127,10 @@ grub_err_t ventoy_cmd_windows_chain_data(grub_extcmd_context_t ctxt, int argc, c
     if (0 == ventoy_compatible && g_wim_valid_patch_count == 0)
     {
         unknown_image = 1;
-        debug("Warning: %s was not recognized by Ventoy\n", args[0]);
+        if (!g_ventoy_wimboot_mode)
+        {
+            debug("Warning: %s was not recognized by Ventoy\n", args[0]);            
+        }
     }
 
     file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s", args[0]);
@@ -1896,10 +2192,10 @@ grub_err_t ventoy_cmd_windows_chain_data(grub_extcmd_context_t ctxt, int argc, c
         }
     }
 
-    chain = grub_malloc(size);
+    chain = ventoy_alloc_chain(size);
     if (!chain)
     {
-        grub_printf("Failed to alloc chain memory size %u\n", size);
+        grub_printf("Failed to alloc chain win1 memory size %u\n", size);
         grub_file_close(file);
         return 1;
     }
@@ -2026,6 +2322,67 @@ static int ventoy_get_wim_chunklist(grub_file_t wimfile, ventoy_img_chunk_list *
     return 0;
 }
 
+grub_err_t ventoy_cmd_is_standard_winiso(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    int i;
+    int ret = 1;
+    char prefix[32] = {0};
+    const char *chkfile[] = 
+    {
+        "boot/bcd", "boot/boot.sdi", NULL
+    };
+
+    (void)ctxt;
+    (void)argc;
+
+    if (ventoy_check_file_exist("%s/sources/boot.wim", args[0]))
+    {
+        prefix[0] = 0;
+    }
+    else if (ventoy_check_file_exist("%s/x86/sources/boot.wim", args[0]))
+    {
+        grub_snprintf(prefix, sizeof(prefix), "/x86");
+    }
+    else if (ventoy_check_file_exist("%s/x64/sources/boot.wim", args[0]))
+    {
+        grub_snprintf(prefix, sizeof(prefix), "/x64");
+    }
+    else
+    {
+        debug("No boot.wim found.\n");
+        goto out;
+    }
+
+    for (i = 0; chkfile[i]; i++)
+    {
+        if (!ventoy_check_file_exist("%s%s/%s", args[0], prefix, chkfile[i]))
+        {
+            debug("%s not found.\n", chkfile[i]);
+            goto out;
+        }
+    }
+
+    if ((!ventoy_check_file_exist("%s%s/sources/install.wim", args[0], prefix)) && 
+        (!ventoy_check_file_exist("%s%s/sources/install.esd", args[0], prefix)))
+    {
+        debug("No install.wim(esd) found.\n");
+        goto out;
+    }
+
+    if (!ventoy_check_file_exist("%s/setup.exe", args[0]))
+    {
+        debug("No setup.exe found.\n");
+        goto out;
+    }
+
+    ret = 0;
+    debug("This is standard Windows ISO.\n");
+
+out:
+
+    return ret;
+}
+
 grub_err_t ventoy_cmd_wim_check_bootable(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     grub_uint32_t boot_index;
@@ -2129,10 +2486,10 @@ static grub_err_t ventoy_vlnk_wim_chain_data(grub_file_t wimfile)
         }
     }
 
-    chain = grub_malloc(size);
+    chain = ventoy_alloc_chain(size);
     if (!chain)
     {
-        grub_printf("Failed to alloc chain memory size %u\n", size);
+        grub_printf("Failed to alloc chain win2 memory size %u\n", size);
         grub_file_close(file);
         return 1;
     }
@@ -2294,10 +2651,10 @@ static grub_err_t ventoy_normal_wim_chain_data(grub_file_t wimfile)
         }
     }
 
-    chain = grub_malloc(size);
+    chain = ventoy_alloc_chain(size);
     if (!chain)
     {
-        grub_printf("Failed to alloc chain memory size %u\n", size);
+        grub_printf("Failed to alloc chain win3 memory size %u\n", size);
         grub_file_close(file);
         return 1;
     }

GRUB2/MOD_SRC/grub-2.04/include/grub/ventoy.h

@@ -139,7 +139,13 @@ typedef struct ventoy_windows_data
     char auto_install_script[384];
     char injection_archive[384];
     grub_uint8_t windows11_bypass_check;
-    grub_uint8_t reserved[255];
+
+    grub_uint32_t auto_install_len;
+
+    grub_uint8_t reserved[255 - 4];
+
+    /* auto_intall file buf */
+    /* ...... + auto_install_len */
 }ventoy_windows_data;
 
 
@@ -256,6 +262,7 @@ typedef struct ventoy_img_chunk_list
 
 #pragma pack(1)
 
+#define VTOY_MAX_CONF_REPLACE    2
 #define GRUB_FILE_REPLACE_MAGIC  0x1258BEEF
 #define GRUB_IMG_REPLACE_MAGIC   0x1259BEEF
 
@@ -276,7 +283,7 @@ typedef struct ventoy_grub_param
     grub_env_get_pf grub_env_get;
     grub_env_set_pf grub_env_set;
     ventoy_grub_param_file_replace file_replace;
-    ventoy_grub_param_file_replace img_replace;
+    ventoy_grub_param_file_replace img_replace[VTOY_MAX_CONF_REPLACE];
     grub_env_printf_pf grub_env_printf;
 }ventoy_grub_param;
 

GRUB2/MOD_SRC/grub-2.04/install.sh

@@ -12,14 +12,14 @@ make install
 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 smbios"
+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 zfs"
 
 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 mouse fwload smbios"
+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 zfs"
 
-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"
+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 zfs"
 
-all_modules_mips64el_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"
+all_modules_mips64el_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 zfs"
 
 
 if [ "$1" = "uefi" ]; then

IMG/cpio/ventoy/hook/clear/hidden-hook.sh

@@ -0,0 +1,43 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program 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.
+# 
+# This program 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 this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. /ventoy/hook/ventoy-hook-lib.sh
+
+VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
+
+NEWROOT=$(grep switch_root /init | awk '{print $3}')
+
+for i in 'usr/bin' 'usr/sbin'; do
+    if [ -f $NEWROOT/$i/udevadm ]; then
+        UPATH=$i
+        break
+    fi
+done
+
+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})
+
+sed "s#UPATH=.*#UPATH=/$UPATH#"  -i /ventoy/hook/clear/udevadm
+sed "s#DM=.*#DM=$vtDM#"  -i /ventoy/hook/clear/udevadm
+
+
+mv $NEWROOT/$UPATH/udevadm  $NEWROOT/$UPATH/udevadm_bk
+cp -a /ventoy/hook/clear/udevadm $NEWROOT/$UPATH/udevadm
+chmod 777 $NEWROOT/$UPATH/udevadm
+

IMG/cpio/ventoy/hook/clear/udevadm

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+UPATH=/usr/bin
+DM=dm-0
+
+rm -f $UPATH/udevadm
+mv $UPATH/udevadm_bk $UPATH/udevadm
+
+echo 1 > /tmp/vthidden
+mount --bind /tmp/vthidden /sys/block/$DM/hidden
+
+exec $UPATH/udevadm "$@"

IMG/cpio/ventoy/hook/clear/ventoy-hook.sh

@@ -26,3 +26,6 @@ else
     echo "find_installer" >> $VTLOG
     $SED "/\$.*find_installer/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/clear/disk-hook.sh" -i  /init
 fi
+
+#issue 1674
+$SED "/switch_root/i $BUSYBOX_PATH/sh $VTOY_PATH/hook/clear/hidden-hook.sh" -i /init

IMG/cpio/ventoy/hook/daphile/disk_hook.sh

@@ -19,6 +19,8 @@
 
 . /ventoy/hook/ventoy-hook-lib.sh
 
+/sbin/mdev -s
+
 # Just for KVM test environment
 $BUSYBOX_PATH/modprobe virtio_blk 2>/dev/null
 $BUSYBOX_PATH/modprobe virtio_pci 2>/dev/null
@@ -34,3 +36,6 @@ for i in 0 1 2 3 4 5 6 7 8 9; do
 done
 
 ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace"
+
+$BUSYBOX_PATH/rm -f /dev/dm-*
+

IMG/cpio/ventoy/hook/daphile/ventoy-hook.sh

@@ -19,6 +19,6 @@
 
 . $VTOY_PATH/hook/ventoy-os-lib.sh
 
-$SED "/mount_boot /i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/gentoo/disk_hook.sh"  -i /init    
+$SED "/mount_boot[^(]*$/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/daphile/disk_hook.sh"  -i /init    
 
 $SED "s#'\.\*/block/mmcblk[^ ]*'#'\.\*/block/dm-[0-9]*'#" -i /init

IMG/cpio/ventoy/hook/debian/disk_mount_hook.sh

@@ -34,3 +34,7 @@ fi
 
 vtlog "${vtdiskname#/dev/}2 found..."
 $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/udev_disk_hook.sh "${vtdiskname#/dev/}2"
+
+if [ -f /ventoy/autoinstall ]; then
+    sh /ventoy/hook/default/auto_install_varexp.sh  /ventoy/autoinstall
+fi

IMG/cpio/ventoy/hook/debian/minios-disk.sh

@@ -33,7 +33,7 @@ ventoy_os_install_dmsetup_by_fuse() {
     vtoy_fuse_iso -f $VTOY_PATH/ventoy_dm_table -m $VTOY_PATH/mnt/fuse
 
     mount -t iso9660  $VTOY_PATH/mnt/fuse/ventoy.iso    $VTOY_PATH/mnt/iso
-    mount -t squashfs $VTOY_PATH/mnt/iso/minios/01-core*.sb  $VTOY_PATH/mnt/squashfs
+    mount -t squashfs $VTOY_PATH/mnt/iso/minios/0*-core*.sb  $VTOY_PATH/mnt/squashfs
 
     KoName=$(ls $VTOY_PATH/mnt/squashfs/lib/modules/$2/kernel/drivers/md/dm-mod.ko*)
     vtlog "insmod $KoName"

IMG/cpio/ventoy/hook/debian/minios-hook.sh

@@ -20,5 +20,5 @@
 if [ -f /lib/livekitlib ] && $GREP -q 'debug_log.*find_data_try' /lib/livekitlib; then
     $SED "/debug_log.*find_data_try/a\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/minios-disk.sh"  -i /lib/livekitlib
 else
-    $SED "/find_data/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/minios-disk.sh"  -i /init
+    $SED "/find_data/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/minios-disk.sh" -i /init
 fi

IMG/cpio/ventoy/hook/debian/stratodesk-disk.sh

@@ -19,21 +19,28 @@
 
 . /ventoy/hook/ventoy-hook-lib.sh
 
-if is_ventoy_hook_finished || not_ventoy_disk "${1:0:-1}"; then
+if is_ventoy_hook_finished; then
     exit 0
 fi
 
+vtlog "####### $0 $* ########"
+
 VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
 
-modprobe fuse
-mkdir -p $VTOY_PATH/mnt/fuse $VTOY_PATH/mnt/iso
+wait_for_usb_disk_ready
 
-vtoydm -p -f $VTOY_PATH/ventoy_image_map -d "/dev/${1:0:-1}" > $VTOY_PATH/ventoy_dm_table
-vtoy_fuse_iso -f $VTOY_PATH/ventoy_dm_table -m $VTOY_PATH/mnt/fuse
-mount -t iso9660 $VTOY_PATH/mnt/fuse/ventoy.iso  $VTOY_PATH/mnt/iso
+vtdiskname=$(get_ventoy_disk_name)
+if [ "$vtdiskname" = "unknown" ]; then
+    vtlog "ventoy disk not found"
+    PATH=$VTPATH_OLD
+    exit 0
+fi
 
-# OK finish
-set_ventoy_hook_finish
+ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2"
+
+mkdir /root
+chmod -R 0755 /root
 
 PATH=$VTPATH_OLD
 
+set_ventoy_hook_finish

IMG/cpio/ventoy/hook/debian/stratodesk-hook.sh

@@ -0,0 +1,20 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program 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.
+# 
+# This program 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 this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+$SED "/maybe_break *post_modules/a\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/stratodesk-disk.sh" -i /init

IMG/cpio/ventoy/hook/debian/ventoy-cloud-init.sh

@@ -44,10 +44,15 @@ if [ $vtSplit -eq 1 ]; then
     vtlog "Line number: $vtLine $vtLine1 $vtLine2"
     sed -n "1,${vtLine1}p"  $VTOY_PATH/autoinstall >/tmpcidata/user-data
     sed -n "${vtLine2},\$p" $VTOY_PATH/autoinstall >/tmpcidata/meta-data
+    
+    sh /ventoy/hook/default/auto_install_varexp.sh  /tmpcidata/user-data
+    sh /ventoy/hook/default/auto_install_varexp.sh  /tmpcidata/meta-data
 else
     vtlog "only user-data avaliable"
     cp -a $VTOY_PATH/autoinstall  /tmpcidata/user-data
     touch /tmpcidata/meta-data
+    
+    sh /ventoy/hook/default/auto_install_varexp.sh  /tmpcidata/user-data
 fi
 
 

IMG/cpio/ventoy/hook/debian/ventoy-hook.sh

@@ -43,6 +43,8 @@ ventoy_get_debian_distro() {
             fi
         elif $GREP -m1 -q 'Minimal.*Linux.*Live' /init; then
             echo 'mll'; return
+        elif $GREP -m1 -q 'stratodesk.com' /init; then
+            echo 'stratodesk'; return
         fi
     fi
 

IMG/cpio/ventoy/hook/default/auto_install_varexp.sh

@@ -0,0 +1,53 @@
+#!/bin/sh
+#************************************************************************************
+# Copyright (c) 2022, longpanda <admin@ventoy.net>
+# 
+# This program 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.
+# 
+# This program 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 this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+PATH=$PATH:/ventoy/busybox:/ventoy/tool
+
+vlog() {
+    echo "$@" >> /ventoy/autoinstall.log
+}
+
+if grep -q '\$\$VT_' /ventoy/autoinstall; then
+    vlog "======== auto install variables expansion ======="
+else
+    vlog "======== auto install variables expansion no need ======="
+    exit 0
+fi
+
+if [ -f /ventoy/ventoy_os_param ]; then
+    VTOYDISK=$(vtoydump -f /ventoy/ventoy_os_param | awk -F'#' '{print $1}')
+    vlog VTOYDISK=$VTOYDISK
+    
+    if [ -b "$VTOYDISK" ]; then
+        vlog "$VTOYDISK exist OK"
+    else
+        vlog "$VTOYDISK does NOT exist"
+        exit 0
+    fi
+    
+    if [ -n "$1" -a -f "$1" ]; then
+        vtoyexpand "$1" "$VTOYDISK"
+    else
+        vlog "File $1 not exist"
+    fi    
+else
+    vlog "os param file not exist"
+    exit 0
+fi
+

IMG/cpio/ventoy/hook/gentoo/ventoy-hook.sh

@@ -24,6 +24,9 @@ if $GREP -q kaspersky /proc/version; then
     if [ -f /ventoy/ventoy_persistent_map ]; then
         $SED "/sysresccd_parsecmdline[^(]*$/a\ BACKSTORE_CMD='LABEL=casper-rw,noloop'"  -i /init
     fi
+elif $GREP -q 'setting up the root filesystem' /init; then
+    $SED "/setting up the root filesystem/a\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/gentoo/disk_hook.sh"  -i /init
+    $SED "/setting up the root filesystem/a\ export CDROOT_DEV=/dev/mapper/ventoy"  -i /init
 elif [ -d /etc/udev/rules.d ] || [ -d /lib/udev/rules.d ]; then    
     ventoy_systemd_udevd_work_around
     ventoy_add_udev_rule "$VTOY_PATH/hook/default/udev_disk_hook.sh %k noreplace"

IMG/cpio/ventoy/hook/kaos/ventoy-disk.sh

@@ -0,0 +1,118 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program 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.
+# 
+# This program 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 this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. /ventoy/hook/ventoy-hook-lib.sh
+
+vtlog "######### $0 $* ############"
+
+VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
+
+
+ventoy_os_install_dmsetup_by_fuse() {
+    vtlog "ventoy_os_install_dmsetup_by_fuse $*"
+
+    mkdir -p $VTOY_PATH/mnt/fuse $VTOY_PATH/mnt/iso $VTOY_PATH/mnt/squashfs
+
+    vtoydm -p -f $VTOY_PATH/ventoy_image_map -d $1 > $VTOY_PATH/ventoy_dm_table
+    vtoy_fuse_iso -f $VTOY_PATH/ventoy_dm_table -m $VTOY_PATH/mnt/fuse
+
+    mount -t iso9660  $VTOY_PATH/mnt/fuse/ventoy.iso    $VTOY_PATH/mnt/iso
+
+    sfsfile=$VTOY_PATH/mnt/iso/kdeos/x86_64/root-image.sqfs
+
+    mount -t squashfs $sfsfile  $VTOY_PATH/mnt/squashfs
+
+    kVer=$(uname -r)
+    KoName=$(ls $VTOY_PATH/mnt/squashfs/lib/modules/$kVer/kernel/drivers/md/dm-mod.ko*)
+    vtlog "insmod $KoName"
+
+    if echo $KoName | grep -q '\.zst'; then
+        zstdcat $KoName > $VTOY_PATH/dm-mod.ko
+        insmod $VTOY_PATH/dm-mod.ko
+    else
+        insmod $KoName
+    fi
+    
+    ventoy_check_umount $VTOY_PATH/mnt/squashfs
+    ventoy_check_umount $VTOY_PATH/mnt/iso
+    ventoy_check_umount $VTOY_PATH/mnt/fuse
+    vtlog "umount done"
+}
+
+
+if is_ventoy_hook_finished; then
+    exit 0
+fi
+
+wait_for_usb_disk_ready
+
+vtdiskname=$(get_ventoy_disk_name)
+if [ "$vtdiskname" = "unknown" ]; then
+    vtlog "ventoy disk not found"
+    exit 0
+fi
+
+if grep -q 'device-mapper' /proc/devices; then
+    vtlog "device-mapper module exist"
+else
+    ventoy_os_install_dmsetup_by_fuse  $vtdiskname
+fi
+
+ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "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})
+vtlog "blkdev_num=$blkdev_num vtDM=$vtDM ..."
+
+while [ -n "Y" ]; do
+    if [ -b /dev/$vtDM ]; then
+        break
+    else
+        sleep 0.3
+    fi
+done
+
+if [ -n "$1" ]; then
+    vtlog "ln -s /dev/$vtDM $1"
+    
+    if [ -e "$1" ]; then
+        vtlog "$1 already exist"
+    else
+        ln -s /dev/$vtDM "$1"
+    fi
+else
+    vtLABEL=$($BUSYBOX_PATH/blkid /dev/$vtDM | $SED 's/.*LABEL="\([^"]*\)".*/\1/')
+    vtlog "vtLABEL is $vtLABEL"
+    
+    if [ -z "$vtLABEL" ]; then
+        vtLABEL=$($SED "s/.*label=\([^ ]*\)/\1/" /proc/cmdline)
+        vtlog "vtLABEL is $vtLABEL from cmdline"
+    fi
+    
+    if [ -e "/dev/disk/by-label/$vtLABEL" ]; then
+        vtlog "$1 already exist"
+    else
+        ln -s /dev/$vtDM "/dev/disk/by-label/$vtLABEL"
+    fi
+fi 
+
+PATH=$VTPATH_OLD
+
+# OK finish
+set_ventoy_hook_finish

IMG/cpio/ventoy/hook/kaos/ventoy-hook.sh

@@ -2,5 +2,14 @@
 
 . $VTOY_PATH/hook/ventoy-os-lib.sh
 
-ventoy_systemd_udevd_work_around
-ventoy_add_udev_rule "$VTOY_PATH/hook/kaos/udev_disk_hook.sh %k"
+if $GREP -q '^"$mount_handler"' /init; then
+    echo 'use mount_handler1 ...' >> $VTLOG
+    $SED "/^\"\$mount_handler\"/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/kaos/ventoy-disk.sh" -i /init    
+elif $GREP -q '^$mount_handler' /init; then
+    echo 'use mount_handler2 ...' >> $VTLOG
+    $SED "/^\$mount_handler/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/kaos/ventoy-disk.sh" -i /init    
+fi
+
+if [ -f $VTOY_PATH/ventoy_persistent_map ]; then
+    $SED "1 aexport cow_label=vtoycow" -i /init 
+fi

IMG/cpio/ventoy/hook/openEuler/ventoy-autoexp.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+#************************************************************************************
+# Copyright (c) 2022, longpanda <admin@ventoy.net>
+# 
+# This program 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.
+# 
+# This program 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 this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+if [ -f /run/install/ks.cfg ]; then
+    sh /ventoy/hook/default/auto_install_varexp.sh  /run/install/ks.cfg
+fi
+
+exit 0

IMG/cpio/ventoy/hook/openEuler/ventoy-hook.sh

@@ -24,18 +24,21 @@ if [ -f $VTOY_PATH/autoinstall ]; then
 else
     for vtParam in $($CAT /proc/cmdline); do
         if echo $vtParam | $GREP -q 'inst.ks=hd:LABEL='; then
+            vtRawKsFull="$vtParam"
             vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
             VTKS="inst.ks=hd:/dev/ventoy:$vtRawKs"
             break
         fi
         
         if echo $vtParam | $GREP -q '^ks=.*:/'; then
+            vtRawKsFull="$vtParam"
             vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
             VTKS="ks=hd:/dev/ventoy:$vtRawKs"
             break
         fi
         
         if echo $vtParam | $GREP -q '^inst.ks=.*:/'; then
+            vtRawKsFull="$vtParam"
             vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
             VTKS="inst.ks=hd:/dev/ventoy:$vtRawKs"
             break
@@ -63,7 +66,13 @@ fi
 echo "VTKS=$VTKS  VTOVERLAY=$VTOVERLAY" >> $VTLOG
 
 if [ -n "$vtRawKs" ]; then
-    echo "$vtRawKs" > $VTOY_PATH/ventoy_ks_rootpath
+    if echo $vtRawKsFull | $EGREP -q "=http|=https|=ftp|=nfs|=hmc"; then
+        echo "vtRawKsFull=$vtRawKsFull no patch needed." >> $VTLOG
+        vtRawKs=""
+        VTKS=""
+    else
+        echo "$vtRawKs" > $VTOY_PATH/ventoy_ks_rootpath
+    fi    
 fi
 
 if ls $VTOY_PATH | $GREP -q 'ventoy_dud[0-9]'; then
@@ -98,3 +107,7 @@ if [ -f /usr/sbin/anaconda-diskroot ]; then
     $SED  's/^mount $dev $repodir/mount -oro $dev $repodir/' -i /usr/sbin/anaconda-diskroot
 fi
 
+
+if [ -f $VTOY_PATH/autoinstall ]; then
+    cp -a $VTOY_PATH/hook/openEuler/ventoy-autoexp.sh /lib/dracut/hooks/pre-mount/99-ventoy-autoexp.sh
+fi

IMG/cpio/ventoy/hook/rhel6/ventoy-hook.sh

@@ -29,10 +29,12 @@ ventoy_add_kernel_udev_rule "loop6" "$VTOY_PATH/hook/rhel6/udev_disk_hook.sh %k"
 
 if [ -f $VTOY_PATH/autoinstall ]; then
     $BUSYBOX_PATH/mv /sbin/loader /sbin/loader_bk
-    $BUSYBOX_PATH/mv $VTOY_PATH/tool/loader /sbin/loader
+    $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/loader /sbin/loader
     
     RawCmdLine=$($BUSYBOX_PATH/cat /proc/cmdline)
     echo -n "/sbin/loader_bk" > "/ventoy/loader_exec_file"
     echo -n "--cmdline=$RawCmdLine ks=file:$VTOY_PATH/autoinstall" > "/ventoy/loader_exec_cmdline"
     #echo 111 > "/ventoy/loader_debug"
+    
+    echo "/bin/sh  /ventoy/hook/rhel6/ventoy-varexp.sh" > "/ventoy/loader_hook_cmd"
 fi

IMG/cpio/ventoy/hook/rhel6/ventoy-varexp.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+#************************************************************************************
+# Copyright (c) 2022, longpanda <admin@ventoy.net>
+# 
+# This program 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.
+# 
+# This program 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 this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+PATH=$PATH:/ventoy/busybox:/ventoy/tool
+
+if grep -q '\$\$VT_' /ventoy/autoinstall; then
+    :
+else
+    exit 0
+fi
+
+if [ -f /sbin/hald ]; then
+    mv /sbin/hald /sbin/hald_bk
+    cp -a /ventoy/tool/hald /sbin/hald
+
+    rm -f "/ventoy/loader_exec_cmdline"
+    echo "/bin/sh  /ventoy/hook/default/auto_install_varexp.sh /ventoy/autoinstall" > "/ventoy/loader_hook_cmd"
+    echo -n "/sbin/hald_bk" > "/ventoy/loader_exec_file"
+fi
+
+exit 0

IMG/cpio/ventoy/hook/rhel7/ventoy-autoexp.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+#************************************************************************************
+# Copyright (c) 2022, longpanda <admin@ventoy.net>
+# 
+# This program 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.
+# 
+# This program 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 this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+if [ -f /run/install/ks.cfg ]; then
+    sh /ventoy/hook/default/auto_install_varexp.sh  /run/install/ks.cfg
+fi
+
+exit 0

IMG/cpio/ventoy/hook/rhel7/ventoy-hook.sh

@@ -26,19 +26,26 @@ if [ -f $VTOY_PATH/autoinstall ]; then
     VTKS="inst.ks=file:$VTOY_PATH/autoinstall"
 else
     for vtParam in $($CAT /proc/cmdline); do
+        if echo $vtParam | $GREP -q 'ks=file:/'; then
+            continue
+        fi
+    
         if echo $vtParam | $GREP -q 'inst.ks=hd:LABEL='; then
+            vtRawKsFull="$vtParam"
             vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
             VTKS="inst.ks=hd:/dev/ventoy:$vtRawKs"
             break
         fi
         
         if echo $vtParam | $GREP -q '^ks=.*:/'; then
+            vtRawKsFull="$vtParam"
             vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
             VTKS="ks=hd:/dev/ventoy:$vtRawKs"
             break
         fi
         
         if echo $vtParam | $GREP -q '^inst.ks=.*:/'; then
+            vtRawKsFull="$vtParam"
             vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
             VTKS="inst.ks=hd:/dev/ventoy:$vtRawKs"
             break
@@ -67,7 +74,13 @@ fi
 echo "VTKS=$VTKS  VTOVERLAY=$VTOVERLAY" >> $VTLOG
 
 if [ -n "$vtRawKs" ]; then
-    echo "$vtRawKs" > $VTOY_PATH/ventoy_ks_rootpath
+    if echo $vtRawKsFull | $EGREP -q "=http|=https|=ftp|=nfs|=hmc"; then
+        echo "vtRawKsFull=$vtRawKsFull no patch needed." >> $VTLOG
+        vtRawKs=""
+        VTKS=""
+    else
+        echo "$vtRawKs" > $VTOY_PATH/ventoy_ks_rootpath
+    fi    
 fi
 
 if ls $VTOY_PATH | $GREP -q 'ventoy_dud[0-9]'; then
@@ -128,3 +141,12 @@ if [ -e /usr/sbin/anaconda-diskroot ]; then
     $SED  's/^mount $dev $repodir/mount -oro $dev $repodir/' -i /usr/sbin/anaconda-diskroot
 fi
 
+#For Fedora CoreOS
+if $GREP -i -q 'fedora.*coreos' /etc/os-release; then
+    $SED "s#isosrc=.*#isosrc=/dev/mapper/ventoy#" -i /lib/systemd/system-generators/live-generator
+    cp -a $VTOY_PATH/hook/rhel7/ventoy-make-link.sh /lib/dracut/hooks/pre-mount/99-ventoy-premount-mklink.sh
+fi
+
+if [ -f $VTOY_PATH/autoinstall ]; then
+    cp -a $VTOY_PATH/hook/rhel7/ventoy-autoexp.sh /lib/dracut/hooks/pre-mount/99-ventoy-autoexp.sh
+fi

IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh

@@ -49,7 +49,12 @@ if is_inotify_ventoy_part $3; then
     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
+        
+        if $GREP -q SCRE /proc/cmdline; then
+            /sbin/dmsquash-live-root /dev/ventoy
+        else
+            $vtScript
+        fi
     else
         vtlog "$vtGenRulFile not exist..."
     fi

IMG/cpio/ventoy/hook/suse/udev_setup_hook.sh

@@ -40,3 +40,11 @@ fi
 if $GREP -q 'mediacheck=1' /proc/cmdline; then   
     ventoy_copy_device_mapper "${vtdiskname}"
 fi
+
+if [ -f /ventoy/autoinstall ]; then
+    sh /ventoy/hook/default/auto_install_varexp.sh  /ventoy/autoinstall
+fi
+if [ -f /autoinst.xml ]; then
+    sh /ventoy/hook/default/auto_install_varexp.sh  /autoinst.xml
+fi
+

IMG/cpio/ventoy/hook/ventoy-hook-lib.sh

@@ -278,11 +278,23 @@ ventoy_dm_patch() {
     
     $CAT /proc/kallsyms | $BUSYBOX_PATH/sort > $VTOY_PATH/kallsyms
     
-    vtLine=$($VTOY_PATH/tool/vtoyksym dm_get_table_device $VTOY_PATH/kallsyms)
+    if $GREP -m1 -q 'open_table_device.isra' $VTOY_PATH/kallsyms; then
+        vtLine=$($VTOY_PATH/tool/vtoyksym open_table_device.isra $VTOY_PATH/kallsyms)
+        vtlog "get open_table_device.isra address $vtLine"
+    else
+        vtLine=$($VTOY_PATH/tool/vtoyksym dm_get_table_device $VTOY_PATH/kallsyms)
+        vtlog "get dm_get_table_device address $vtLine"
+    fi 
     get_addr=$(echo $vtLine | $AWK '{print $1}')
     get_size=$(echo $vtLine | $AWK '{print $2}')
 
-    vtLine=$($VTOY_PATH/tool/vtoyksym dm_put_table_device $VTOY_PATH/kallsyms)
+    if $GREP -m1 -q 'close_table_device.isra' $VTOY_PATH/kallsyms; then
+        vtLine=$($VTOY_PATH/tool/vtoyksym close_table_device.isra $VTOY_PATH/kallsyms)
+        vtlog "get close_table_device.isra address $vtLine"
+    else
+        vtLine=$($VTOY_PATH/tool/vtoyksym dm_put_table_device $VTOY_PATH/kallsyms)
+        vtlog "get dm_put_table_device address $vtLine"
+    fi
     put_addr=$(echo $vtLine | $AWK '{print $1}')
     put_size=$(echo $vtLine | $AWK '{print $2}')
     
@@ -738,6 +750,7 @@ ventoy_udev_disk_common_hook() {
     fi
     
     if $GREP -q 'dm_patch' /proc/modules; then
+        vtlog "remove dm_patch module."
         $BUSYBOX_PATH/rmmod dm_patch
     fi
 }
@@ -868,3 +881,14 @@ ventoy_check_install_module_xz() {
         $BUSYBOX_PATH/insmod "$1"
     fi
 }
+
+ventoy_check_umount() {
+    for vtLoop in 0 1 2 3 4 5 6 7 8 9; do
+        $BUSYBOX_PATH/umount "$1" > /dev/null 2>&1
+        if $BUSYBOX_PATH/mountpoint -q "$1"; then
+            $SLEEP 1
+        else
+            break
+        fi
+    done
+}

IMG/cpio/ventoy/loop/easyos/ventoy-hook.sh

@@ -1,6 +1,6 @@
 #!/ventoy/busybox/sh
 #************************************************************************************
-# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# Copyright (c) 2022, longpanda <admin@ventoy.net>
 # 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -26,7 +26,7 @@ $SED "1a boot_dev=ventoy1;wkg_dev=ventoy2" -i /init
 #check for ssd will read /sys/block/ventoy, will no exist, need a workaround
 $SED "s#/sys/block/\${WKG_DRV}/#/sys/block/\$vtDM/#g"  -i /init
 
-#skip the resizing process, can't resizing partition
-$SED "s#640M#0M#g"  -i /init
+#resizing process
+$SED "s#partprobe.*#$BUSYBOX_PATH/sh $VTOY_PATH/loop/easyos/ventoy-resize.sh \$WKG_DEV#g"  -i /init
 
 

IMG/cpio/ventoy/loop/easyos/ventoy-resize.sh

@@ -0,0 +1,45 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2022, longpanda <admin@ventoy.net>
+# 
+# This program 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.
+# 
+# This program 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 this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. /ventoy/hook/ventoy-hook-lib.sh
+
+vtlog "####### $0 $* ########"
+
+VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
+
+blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')
+vtDM0=$(ventoy_find_dm_id ${blkdev_num})
+blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy2 | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')
+vtDM2=$(ventoy_find_dm_id ${blkdev_num})
+vtlog "vtDM0=$vtDM0 vtDM2=$vtDM2"
+
+vtSize=$(cat /sys/block/$vtDM0/size)
+vtSize1=$(sed -n "1p" /vtoy_dm_table | awk '{print $2}')
+vtStart1=$(sed -n "1p" /vtoy_dm_table | awk '{print $5}')
+vtSize2=$(sed -n "2p" /vtoy_dm_table | awk '{print $2}')
+vtNewSize2=$(expr $vtSize - $vtSize1 - $vtStart1)
+vtlog "vtSize=$vtSize vtSize1=$vtSize1 vtStart1=$vtStart1 vtSize2=$vtSize2 vtNewSize2=$vtNewSize2"
+
+
+sed -n "2p" /vtoy_dm_table > /ventoy/resize_table
+sed -i "s/$vtSize2/$vtNewSize2/" /ventoy/resize_table
+
+dmsetup remove ventoy2
+dmsetup create ventoy2 /ventoy/resize_table
+

IMG/cpio/ventoy/ventoy_chain.sh

@@ -362,6 +362,13 @@ ventoy_get_os_type() {
     fi
     
     
+    #Kylin V10 Server
+    if [ -f /usr/sbin/dhclient ]; then
+        if $BUSYBOX_PATH/strings /usr/sbin/dhclient | $GREP -i -q -m1 openeuler; then
+            echo 'openEuler'; return
+        fi
+    fi
+    
     
     echo "default"
 }

INSTALL/CreatePersistentImg.sh

@@ -18,6 +18,18 @@ print_usage() {
     echo ''
 }
 
+print_err() {
+    echo ""
+    echo "$*"
+    echo ""
+}
+
+uid=$(id -u)
+if [ $uid -ne 0 ]; then
+    print_err "Please use sudo or run the script as root."
+    exit 1
+fi
+
 while [ -n "$1" ]; do
     if [ "$1" = "-s" ]; then
         shift

INSTALL/ExtendPersistentImg.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 print_usage() {
     echo 'Usage:  ExtendPersistentImg.sh file size'
@@ -19,6 +19,18 @@ if [ -z "$2" ]; then
     exit 1
 fi
 
+
+if [ "$1" = "__vbash__" ]; then
+    shift
+else
+    if readlink /bin/sh | grep -q bash; then
+        :
+    else
+        exec /bin/bash $0 "__vbash__" "$@"
+    fi
+fi
+
+
 file=$1
 size=$2
 

INSTALL/VentoyPlugson.sh

@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 . ./tool/ventoy_lib.sh
 
 print_usage() {    
-    echo 'Usage:  sudo sh VentoyPlugson.sh [OPTION] /dev/sdX'
+    echo 'Usage:  sudo bash VentoyPlugson.sh [OPTION] /dev/sdX'
     echo '  OPTION: (optional)'
     echo '   -H x.x.x.x  http server IP address (default is 127.0.0.1)'
     echo '   -P PORT     http server PORT (default is 24681)'
@@ -17,6 +17,15 @@ if [ $uid -ne 0 ]; then
     exit 1
 fi
 
+if [ "$1" = "__vbash__" ]; then
+    shift
+else
+    if readlink /bin/sh | grep -q bash; then
+        :
+    else
+        exec /bin/bash $0 "__vbash__" "$@"
+    fi
+fi
 
 OLDDIR=$(pwd)
 

INSTALL/VentoyWeb.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 print_usage() {    
     echo 'Usage:  VentoyWeb.sh [ OPTION ]'   

INSTALL/grub/grub.cfg

@@ -158,7 +158,7 @@ function get_os_type {
 function vt_check_compatible_pe {
     #Check for PE without external tools
     #set compatible if ISO file is less than 80MB
-    if [ $vt_chosen_size -gt 33554432 -a $vt_chosen_size -le 83886080 ]; then
+    if [ $vt_chosen_size -GT 33554432 -a $vt_chosen_size -LE 83886080 ]; then
         set ventoy_compatible=YES    
     fi
 
@@ -185,7 +185,7 @@ function locate_initrd {
 }
 
 function locate_wim {
-    vt_windows_locate_wim_patch (loop)
+    vt_windows_locate_wim_patch (loop) "$1"
     
     if [ -n "${vtdebug_flag}" ]; then
         echo '###############################################'
@@ -381,7 +381,9 @@ function distro_specify_initrd_file_phase2 {
         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
-    
+    elif [ -f (loop)/images/pxeboot/initrd.img ]; then
+        vt_linux_specify_initrd_file /images/pxeboot/initrd.img
+
     fi
 }
 
@@ -597,8 +599,12 @@ function ventoy_unix_comm_proc {
 function uefi_windows_menu_func {
     vt_windows_reset
 
-    if [ "$ventoy_compatible" = "NO" ]; then   
-        
+    unset vt_cur_wimboot_mode
+    if vt_check_mode 4 "$vt_chosen_name"; then
+        set vt_cur_wimboot_mode=1
+    fi
+
+    if [ "$ventoy_compatible" = "NO" -o "$vt_cur_wimboot_mode" = "1" ]; then
         if [ "$ventoy_fs_probe" = "iso9660" ]; then
             loopback -d loop
             vt_iso9660_nojoliet 1            
@@ -615,16 +621,16 @@ function uefi_windows_menu_func {
         fi
         
         ventoy_debug_pause        
-        locate_wim
+        locate_wim "${chosen_path}"
     fi
-
+    
     vt_windows_chain_data "${1}${chosen_path}"
     ventoy_debug_pause
-    
-    if vt_check_mode 4; then
-        vtoy_windows_wimboot_func
+
+    if [ "$vt_cur_wimboot_mode" = "1" ]; then
+        vtoy_wimboot_func
     fi
-    
+
     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console
@@ -688,6 +694,9 @@ function uefi_linux_menu_func {
         vt_linux_initrd_count vtcount
         
         if [ $vtcount -eq 0 ]; then
+            if [ -e (loop)/EFI/boot/livegrub.cfg ]; then
+                vt_linux_parse_initrd_grub  file  (loop)/EFI/boot/livegrub.cfg
+            fi
             distro_specify_initrd_file_phase2
             
             if [ "$vt_efi_dir" = "NO" ]; then
@@ -765,7 +774,7 @@ function uefi_linux_menu_func {
     
     vt_linux_chain_data "${1}${chosen_path}"
 
-    if [ -n "$LoadIsoEfiDriver" -a $vt_chosen_size -lt 104857600 ]; then
+    if [ -n "$LoadIsoEfiDriver" -a $vt_chosen_size -LT 104857600 ]; then
         if [ -f (loop)/efi/clover/cloverx64.efi ]; then
             unset LoadIsoEfiDriver
         fi
@@ -776,8 +785,12 @@ function uefi_linux_menu_func {
         ventoy_cli_console     
 
         unset vtGrub2Mode
-        if vt_check_mode 3; then
+        if vt_check_mode 3 "$vt_chosen_name"; then
             set vtGrub2Mode=1
+        elif vt_str_begin "$vt_volume_id" "HOLO_"; then
+            if [ -d (loop)/loader/entries ]; then
+                set vtGrub2Mode=1
+            fi
         elif vt_str_begin "$vt_volume_id" "KRD"; then
             if [ -f (loop)/boot/grub/grub.cfg.sig ]; then
                 set vtGrub2Mode=1
@@ -811,6 +824,18 @@ function uefi_linux_menu_func {
                 break
             fi
         done
+        if [ $vtback_cfg_find -eq 0 ]; then
+            if [ -f (loop)/loader/loader.conf -a -d (loop)/loader/entries ]; then
+                if vt_str_begin "$vt_volume_id" "HOLO_"; then
+                    set root=(loop,2)
+                    vt_systemd_menu (loop,2) vt_sys_menu_mem
+                else
+                    vt_systemd_menu (loop) vt_sys_menu_mem
+                fi
+                set vtback_cfg_find=1
+                configfile "mem:${vt_sys_menu_mem_addr}:size:${vt_sys_menu_mem_size}"
+            fi
+        fi
 
         if [ "$vtback_cfg_find" = "0" ]; then
             echo " "
@@ -864,7 +889,7 @@ function uefi_iso_menu_func {
     if [ -n "$vtisouefi" ]; then
         set LoadIsoEfiDriver=on
         unset vtisouefi
-    elif vt_check_mode 2; then
+    elif vt_check_mode 2 "$vt_chosen_name"; then
         set LoadIsoEfiDriver=on
     else
         unset LoadIsoEfiDriver
@@ -901,12 +926,20 @@ function uefi_iso_menu_func {
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat
-    elif vt_check_mode 1; then
+    elif vt_check_mode 1 "$vt_chosen_name"; then
         set ventoy_compatible=YES
     else
         vt_check_compatible (loop)        
     fi
     
+    if vt_need_secondary_menu "$vt_chosen_name"; then
+        vt_show_secondary_menu "$vt_chosen_path" "$vtoy_os" $vt_chosen_size
+        if vt_check_mode 0 "$vt_chosen_name"; then
+            uefi_iso_memdisk $vtoy_iso_part  "$vt_chosen_path"
+            return
+        fi
+    fi
+    
     vt_img_sector "${1}${chosen_path}"
     
     if [ "$ventoy_fs_probe" = "iso9660" ]; then
@@ -937,8 +970,7 @@ function uefi_iso_memdisk {
     ventoy_gui_console
 }
 
-
-function vtoy_windows_wimboot_func {
+function vtoy_windows_wimboot {
     if [ -f (loop)/x86/sources/boot.wim -a -f (loop)/x64/sources/boot.wim ]; then
         vt_sel_wimboot vtoy_wimboot_bit
         if [ "$vtoy_wimboot_bit" = "32" ]; then
@@ -956,43 +988,24 @@ function vtoy_windows_wimboot_func {
     fi
 
     if [ -n "${vtdebug_flag}" ]; then
-        echo vtoy_wimboot_prefix=$vtoy_wimboot_prefix vtoy_wimboot_bit=$vtoy_wimboot_bit
+        echo vtoy_wimboot_prefix=$vtoy_wimboot_prefix vtoy_wimboot_bit=$vtoy_wimboot_bit vt_wimkernel=$vt_wimkernel
     fi
 
-    for wmfile in sources/boot.wim boot/bcd boot/boot.sdi; do
-        if [ ! -f $vtoy_wimboot_prefix/$wmfile ]; then
-            return
-        fi
-    done
-
-    if [ -f $vtoy_wimboot_prefix/sources/install.wim -o -f $vtoy_wimboot_prefix/sources/install.esd ]; then
-        vt_windows_wimboot_data
-    else
-        return
-    fi
+    vt_windows_wimboot_data "$vtoy_wimboot_prefix/sources/boot.wim" vtoy_init_exe vtoy_wim_bit
     
     if [ "$grub_platform" = "pc" ]; then
-        set vt_wimkernel=wimboot.x86_64.xz
-        
         linux16  "$vtoy_path/$vt_wimkernel"  quiet
         ventoy_debug_pause
 
         vt_set_wim_load_prompt 1 "Loading files......"
-        initrd16 newc:vtoyjump.exe:$vtoy_path/vtoyjump${vtoy_wimboot_bit}.exe \
-             newc:wimboot.data:mem:${vtoy_wimboot_mem_addr}:size:${vtoy_wimboot_mem_size} \
-             newc:winpeshl.ini:mem:${vtoy_winpeshl_ini_addr}:size:${vtoy_winpeshl_ini_size} \
+        initrd16 newc:winpeshl.exe:mem:${vtoy_wimboot_mem_addr}:size:${vtoy_wimboot_mem_size} \
+             newc:vtoy_wimboot:$vtoy_wimboot_prefix/boot/bcd \
              newc:bcd:$vtoy_wimboot_prefix/boot/bcd \
              newc:boot.sdi:$vtoy_wimboot_prefix/boot/boot.sdi \
              newc:boot.wim:$vtoy_wimboot_prefix/sources/boot.wim
         vt_set_wim_load_prompt 0
         boot
     else
-        if [ "$grub_cpu" = "i386" ]; then
-            set vt_wimkernel=wimboot.i386.efi.xz
-        else
-            set vt_wimkernel=wimboot.x86_64.xz
-        fi
-
         vt_set_wim_load_prompt 1 "Loading files......"
         vt_load_file_to_mem "nodecompress" $vtoy_wimboot_prefix/sources/boot.wim vtoy_wimfile_mem
         vt_set_wim_load_prompt 0
@@ -1005,9 +1018,8 @@ function vtoy_windows_wimboot_func {
 
         ventoy_cli_console
         chainloader "$vtoy_path/$vt_wimkernel" quiet \
-            "vf=wimboot.data:mem:${vtoy_wimboot_mem_addr}:size:${vtoy_wimboot_mem_size}" \
-            "vf=winpeshl.ini:mem:${vtoy_winpeshl_ini_addr}:size:${vtoy_winpeshl_ini_size}" \
-            "vf=vtoyjump.exe:$vtoy_path/vtoyjump${vtoy_wimboot_bit}.exe" \
+            "vf=winpeshl.exe:mem:${vtoy_wimboot_mem_addr}:size:${vtoy_wimboot_mem_size}" \
+            "vf=vtoy_wimboot:$vtoy_wimboot_prefix/boot/bcd" \
             "vf=bcd:$vtoy_wimboot_prefix/boot/bcd" \
             "vf=boot.sdi:$vtoy_wimboot_prefix/boot/boot.sdi" \
             "vf=boot.wim:$vtoy_wimfile_path" \
@@ -1018,11 +1030,125 @@ function vtoy_windows_wimboot_func {
     fi
 }
 
+function vtoy_winpe_wimboot {
+    unset vtoy_boot_sdi_legacy
+    unset vtoy_boot_sdi_efi
+    
+    set vtoy_wimboot_prefix=(loop)    
+    set vtoy_wim_path="$1"
+    
+    if [ -n "${vtdebug_flag}" ]; then
+        echo "winpe_wimboot $1 $2 $3"
+    fi
+    
+    if [ "$2" != "0" ]; then
+        set vtoy_boot_sdi_legacy="newc:boot.sdi:$vtoy_wimboot_prefix/$2"
+        set vtoy_boot_sdi_efi="vf=boot.sdi:$vtoy_wimboot_prefix/$2"
+    fi
+
+    vt_windows_wimboot_data $vtoy_wimboot_prefix/$vtoy_wim_path vtoy_init_exe vtoy_wim_bit
+    
+    if [ "$grub_platform" = "pc" ]; then
+        linux16  "$vtoy_path/$vt_wimkernel" quiet
+        ventoy_debug_pause
+
+        vt_set_wim_load_prompt 1 "Loading files......"         
+        initrd16 newc:$vtoy_init_exe:mem:${vtoy_wimboot_mem_addr}:size:${vtoy_wimboot_mem_size} \
+             newc:vtoy_wimboot:$vtoy_path/$vt_wimkernel \
+             newc:bootmgr.exe:mem:${vtoy_pe_bootmgr_mem_addr}:size:${vtoy_pe_bootmgr_mem_size} \
+             newc:bcd:mem:${vtoy_pe_bcd_mem_addr}:size:${vtoy_pe_bcd_mem_size} \
+             $vtoy_boot_sdi_legacy \
+             newc:boot.wim:$vtoy_wimboot_prefix/$vtoy_wim_path
+        vt_set_wim_load_prompt 0        
+        boot
+    else
+        if [ "$VTOY_EFI_ARCH" = "x64" -a "$vtoy_wim_bit" = "32" ]; then
+            echo -e "\nThis is 32bit Windows and does NOT support x86_64 UEFI firmware.\n"
+            echo -e "这是32位的 Windows 系统，不支持当前的64位 UEFI 环境。\n"
+        fi
+
+        vt_set_wim_load_prompt 1 "Loading files......"
+        vt_load_file_to_mem "nodecompress" $vtoy_wimboot_prefix/$vtoy_wim_path vtoy_wimfile_mem
+        vt_set_wim_load_prompt 0
+
+        if [ $? -eq 0 ]; then
+            set vtoy_wimfile_path=mem:${vtoy_wimfile_mem_addr}:size:${vtoy_wimfile_mem_size}
+        else
+            set vtoy_wimfile_path=$vtoy_wimboot_prefix/$vtoy_wim_path
+        fi
+        
+        unset vtoy_boot_efi_path
+        if [ -F (loop)/efi/boot/boot${VTOY_EFI_ARCH}.efi ]; then
+            set vtoy_boot_efi_path="vf=bootx64.efi:(loop)/efi/boot/boot${VTOY_EFI_ARCH}.efi"
+        fi
+
+        ventoy_cli_console
+        chainloader "$vtoy_path/$vt_wimkernel" quiet \
+            "vf=$vtoy_init_exe:mem:${vtoy_wimboot_mem_addr}:size:${vtoy_wimboot_mem_size}" \
+            "vf=vtoy_wimboot:$vtoy_path/$vt_wimkernel" \
+            "vf=bcd:mem:${vtoy_pe_bcd_mem_addr}:size:${vtoy_pe_bcd_mem_size}" \
+            "$vtoy_boot_sdi_efi" \
+            "$vtoy_boot_efi_path" \
+            "vf=boot.wim:$vtoy_wimfile_path" \
+            pfsize=$vtoy_chain_file_size  \
+            pfread=$vtoy_chain_file_read
+        boot
+        ventoy_gui_console
+    fi
+}
+
+function vtoy_wimboot_func {
+    if [ "$grub_platform" = "pc" ]; then
+        set vt_wimkernel=wimboot.x86_64.xz        
+    else
+        if [ "$grub_cpu" = "i386" ]; then
+            set vt_wimkernel=wimboot.i386.efi.xz
+        else
+            set vt_wimkernel=wimboot.x86_64.xz
+        fi
+    fi
+
+    if vt_is_standard_winiso (loop); then
+        echo -e "\n==================== VENTOY WIMBOOT ==================\n"
+        vtoy_windows_wimboot
+    else
+        vt_sel_winpe_wim (loop)
+        if [ -n "$vtoy_pe_wim_path" ]; then            
+            echo -e "\n==================== VENTOY WIMBOOT ==================\n"
+            
+            vt_fs_ignore_case 1
+            vt_load_file_to_mem "auto" $vtoy_path/common_bcd.xz vtoy_pe_bcd_mem
+            
+            set vt_sdi_path=0
+            for vsdi in "boot/boot.sdi" "2K10/FONTS/boot.sdi" "SSTR/boot.sdi" "ISPE/BOOT.SDI" \
+            "boot/uqi.sdi" "ISYL/boot.sdi" "WEPE/WEPE.SDI" ; do
+                if [ -F "(loop)/$vsdi" ]; then
+                    set vt_sdi_path=$vsdi
+                    break
+                fi
+            done
+            
+            if [ "$grub_platform" = "pc" ]; then
+                vt_load_file_to_mem "auto" $vtoy_path/common_bootmgr.xz vtoy_pe_bootmgr_mem
+                vtoy_winpe_wimboot "$vtoy_pe_wim_path" "$vt_sdi_path" 1
+            else
+                vtoy_winpe_wimboot "$vtoy_pe_wim_path" "$vt_sdi_path" 0
+            fi
+            
+            vt_fs_ignore_case 0
+        fi
+    fi
+}
+
 function legacy_windows_menu_func {
     vt_windows_reset
     
-    if [ "$ventoy_compatible" = "NO" ]; then   
-        
+    unset vt_cur_wimboot_mode
+    if vt_check_mode 4 "$vt_chosen_name"; then
+        set vt_cur_wimboot_mode=1
+    fi
+    
+    if [ "$ventoy_compatible" = "NO" -o "$vt_cur_wimboot_mode" = "1" ]; then
         if [ "$ventoy_fs_probe" = "iso9660" ]; then
             loopback -d loop
             vt_iso9660_nojoliet 1
@@ -1040,15 +1166,17 @@ function legacy_windows_menu_func {
             distro_specify_wim_patch_phase2
         fi
         
-        ventoy_debug_pause        
-        locate_wim
+        ventoy_debug_pause
+        if [ -z "$vt_cur_wimboot_mode" ]; then
+            locate_wim "${chosen_path}"
+        fi
     fi
-
+    
     vt_windows_chain_data "${1}${chosen_path}"
-    ventoy_debug_pause    
-
-    if vt_check_mode 4; then
-        vtoy_windows_wimboot_func
+    ventoy_debug_pause
+    
+    if [ "$vt_cur_wimboot_mode" = "1" ]; then
+        vtoy_wimboot_func
     fi
 
     if [ -n "$vtoy_chain_mem_addr" ]; then
@@ -1130,10 +1258,19 @@ function legacy_linux_menu_func {
     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
-        if vt_check_mode 3; then
+        unset vtGrub2Mode
+        if vt_check_mode 3 "$vt_chosen_name"; then
+            set vtGrub2Mode=1
+        elif vt_str_begin "$vt_volume_id" "HOLO_"; then
+            if [ -d (loop)/loader/entries ]; then
+                set vtGrub2Mode=1
+            fi        
+        fi
+    
+        if [ -n "$vtGrub2Mode" ]; then
             ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
             ventoy_cli_console
-        
+
             # fallback
             set vtback_root=$root        
             vt_push_last_entry
@@ -1152,6 +1289,18 @@ function legacy_linux_menu_func {
                     break
                 fi
             done
+            if [ $vtback_cfg_find -eq 0 ]; then
+                if [ -f (loop)/loader/loader.conf -a -d (loop)/loader/entries ]; then                    
+                    if vt_str_begin "$vt_volume_id" "HOLO_"; then
+                        set root=(loop,2)
+                        vt_systemd_menu (loop,2) vt_sys_menu_mem
+                    else
+                        vt_systemd_menu (loop) vt_sys_menu_mem
+                    fi
+                    set vtback_cfg_find=1  
+                    configfile "mem:${vt_sys_menu_mem_addr}:size:${vt_sys_menu_mem_size}"
+                fi
+            fi
 
             vt_unset_boot_opt
             set root=$vtback_root        
@@ -1209,12 +1358,20 @@ function legacy_iso_menu_func {
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat
-    elif vt_check_mode 1; then
+    elif vt_check_mode 1 "$vt_chosen_name"; then
         set ventoy_compatible=YES
     else
         vt_check_compatible (loop)
     fi
     
+    if vt_need_secondary_menu "$vt_chosen_name"; then
+        vt_show_secondary_menu "$vt_chosen_path" "$vtoy_os" $vt_chosen_size  
+        if vt_check_mode 0 "$vt_chosen_name"; then
+            legacy_iso_memdisk $vtoy_iso_part  "$vt_chosen_path"
+            return
+        fi        
+    fi
+
     vt_img_sector "${1}${chosen_path}"
 
     if [ "$ventoy_fs_probe" = "iso9660" ]; then
@@ -1304,7 +1461,7 @@ function iso_common_menuentry {
     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        
+    if [ $vt_volume_space -NE $vt_chosen_size ]; then        
         vt_mod $vt_chosen_size 2048 vt_chosen_size_mod
         if [ $vt_chosen_size_mod -ne 0 ]; then
             echo -e "\n $vt_volume_space $vt_chosen_size $vt_chosen_size_mod\n"
@@ -1340,7 +1497,7 @@ function iso_common_menuentry {
     # auto memdisk mode for some special ISO files
     vt_iso_vd_id_parse "${vtoy_iso_part}${vt_chosen_path}"    
     unset vtMemDiskBoot
-    if vt_check_mode 0; then
+    if vt_check_mode 0 "$vt_chosen_name"; then
         set vtMemDiskBoot=1
     else
         if [ "$grub_platform" = "pc" ]; then
@@ -1352,7 +1509,7 @@ function iso_common_menuentry {
         fi
         
         #For iKuai8 (<64MB)
-        if [ $vt_chosen_size -le 67108864 ]; then
+        if [ $vt_chosen_size -LE 67108864 ]; then
             if vt_str_begin "$vt_chosen_name" "iKuai"; then
                 set vtMemDiskBoot=1
             fi
@@ -1377,7 +1534,7 @@ function iso_common_menuentry {
 }
 
 function miso_common_menuentry {
-    vt_chosen_img_path vt_chosen_path vt_chosen_size
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
 
     if vt_check_password "${vt_chosen_path}"; then
         return
@@ -1411,7 +1568,7 @@ function iso_unsupport_menuentry {
 }
 
 function wim_common_menuentry {
-    vt_chosen_img_path vt_chosen_path vt_chosen_size
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
     
     if vt_check_password "${vt_chosen_path}"; then
         return
@@ -1450,7 +1607,7 @@ function wim_unsupport_menuentry {
 }
 
 function efi_common_menuentry {
-    vt_chosen_img_path vt_chosen_path vt_chosen_size
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
     
     if vt_check_password "${vt_chosen_path}"; then
         return
@@ -1520,7 +1677,7 @@ function vhdboot_common_func {
 }
 
 function vhd_common_menuentry {
-    vt_chosen_img_path vt_chosen_path vt_chosen_size
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
     
     if vt_check_password "${vt_chosen_path}"; then
         return
@@ -1617,7 +1774,7 @@ function vtoyboot_common_func {
 }
 
 function vtoy_common_menuentry {    
-    vt_chosen_img_path vt_chosen_path vt_chosen_size     
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
     
     if vt_check_password "${vt_chosen_path}"; then
         return
@@ -1794,7 +1951,7 @@ function ventoy_img_ubos {
 }
 
 function ventoy_img_recalbox {
-    if [ $vtoy_img_max_part_end -gt $vt_chosen_size ]; then
+    if [ $vtoy_img_max_part_end -GT $vt_chosen_size ]; then
         echo -e "\nPlease extend the img file size before boot it. \n"
         ventoy_pause
         return
@@ -2027,7 +2184,7 @@ function img_common_menuentry {
     set ventoy_busybox_ver=32
     unset LoadIsoEfiDriver
 
-    vt_chosen_img_path vt_chosen_path vt_chosen_size
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
     
     if vt_check_password "${vt_chosen_path}"; then
         return
@@ -2038,7 +2195,7 @@ function img_common_menuentry {
     fi
 
     if [ "$grub_platform" = "pc" ]; then
-        if vt_check_mode 0; then
+        if vt_check_mode 0 "$vt_chosen_name"; then
             legacy_img_memdisk $vtoy_iso_part "$vt_chosen_path"
             return
         fi
@@ -2073,11 +2230,15 @@ function img_common_menuentry {
     if vt_str_begin "$vtImgHd3Label" "ROOT-"; then
         if [ -f (vtimghd,3)/etc/os-release.d/ID ]; then 
             vt_1st_line (vtimghd,3)/etc/os-release.d/ID vt_release_line1
-            if [ vt_str_begin "$vt_release_line1" "FydeOS" ]; then
+            if vt_str_begin "$vt_release_line1" "FydeOS"; then
                 ventoy_img_fydeos
+            else
+                ventoy_img_cloudready
             fi
         elif [ -f (vtimghd,3)/etc/cloudready-release ]; then
             ventoy_img_cloudready
+        elif [ -f (vtimghd,3)/etc/chrome_dev.conf ]; then
+            ventoy_img_cloudready
         fi
     elif vt_str_begin "$vtImgHd1Label" "LAKKA"; then
         ventoy_img_openelec lakka
@@ -2142,7 +2303,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.75"
+set VENTOY_VERSION="1.0.80"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -2200,6 +2361,11 @@ if [ "$vtoy_dev" = "tftp" ]; then
     done
     loadfont ascii
 
+    if [ -n "$vtoy_efi_part" ]; then
+        vt_load_file_to_mem "auto" $vtoy_efi_part/grub/fonts/unicode.pf2 vtoy_font_mem
+        loadfont mem:${vtoy_font_mem_addr}:size:${vtoy_font_mem_size}
+    fi
+
     if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then
         set vt_plugin_path=$vtoy_iso_part
     else

INSTALL/grub/help/de_DE.txt

@@ -8,10 +8,10 @@ F6 - Benutzerdefiniertes Grub2-Menü laden
 F7 - Wechseln zwischen GUI-Modus <-> TEXT-Modus
 
 m - Prüfsummencheck Image Dateien (md5/sha1/sha256/sha512)
-Ctrl+w - WIMBOOT Modus (Nur für Standard Windows ISO)
-Ctrl+r - Grub2 Modus (Nur für einige Linux distros)
-Ctrl+i - Kompatibilitäts Modus (Nur für Fehleranalyse)
-Ctrl+u - Lade ISO efi Treiber (Nur für Fehleranalyse, darf nicht offiziel benutzt werden)
+w/Ctrl+w - WIMBOOT Modus (Nur für Standard Windows ISO)
+r/Ctrl+r - Grub2 Modus (Nur für einige Linux distros)
+i/Ctrl+i - Kompatibilitäts Modus (Nur für Fehleranalyse)
+u/Ctrl+u - Lade ISO efi Treiber (Nur für Fehleranalyse, darf nicht offiziel benutzt werden)
 
 
 

INSTALL/grub/help/en_US.txt

@@ -8,10 +8,10 @@ F6 - Load Custom Grub2 Menu
 F7 - Switch between GUI Mode <-> TEXT Mode
 
 m - Checksum image files (md5/sha1/sha256/sha512)
-Ctrl+w - WIMBOOT Mode (Only for standard Windows ISO)
-Ctrl+r - Grub2 Mode (Only for some Linux distros)
-Ctrl+i - Compatible Mode (Just only for debug)
-Ctrl+u - Load ISO efi driver (Just only for debug, can not be used officially)
+w/Ctrl+w - WIMBOOT Mode (Only for standard Windows ISO)
+r/Ctrl+r - Grub2 Mode (Only for some Linux distros)
+i/Ctrl+i - Compatible Mode (Just only for debug)
+u/Ctrl+u - Load ISO efi driver (Just only for debug, can not be used officially)
 
 
 

INSTALL/grub/help/fr_FR.txt

@@ -8,9 +8,9 @@ F6 - Charger le menu Grub2 personnalisé
 F7 - Basculer entre le mode graphique <-> mode texte
 
 m - Somme de contrôle des images (md5/sha1/sha256/sha512)
-Ctrl+w - Mode WIMBOOT (seulement pour les images standards Windows)
-Ctrl+r - Mode Grub2 (seulement pour quelques Linux)
-Ctrl+i - Mode Compatible (seulement à fins de tests)
-Ctrl+u - Load ISO efi driver (Just only for debug, can not be used officially)
+w/Ctrl+w - Mode WIMBOOT (seulement pour les images standards Windows)
+r/Ctrl+r - Mode Grub2 (seulement pour quelques Linux)
+i/Ctrl+i - Mode Compatible (seulement à fins de tests)
+u/Ctrl+u - Load ISO efi driver (Just only for debug, can not be used officially)
 
 Appuyer sur Echap pour sortir ......

INSTALL/grub/help/hr_HR.txt

@@ -8,10 +8,10 @@ F6 - Učitava prilagođen GRUB2 meni
 F7 - Mijenja između GUI <-> TEXT načina rada
 
 m - Generira heš odabranog imidž fajla (md5/sha1/sha256/sha512)
-Ctrl+w - WIMBOOT način rada (samo za standardne Windows imidž fajlove)
-Ctrl+r - GRUB2 način rada (samo za neke Linux distribucije)
-Ctrl+i - Kompatibilni način rada (samo za testiranje)
-Ctrl+u - Učitava EFI drajver za imidž fajlove (samo za testiranje)
+w/Ctrl+w - WIMBOOT način rada (samo za standardne Windows imidž fajlove)
+r/Ctrl+r - GRUB2 način rada (samo za neke Linux distribucije)
+i/Ctrl+i - Kompatibilni način rada (samo za testiranje)
+u/Ctrl+u - Učitava EFI drajver za imidž fajlove (samo za testiranje)
 
 
 

INSTALL/grub/help/id_ID.txt

@@ -8,10 +8,10 @@ F6 - Memuat ubah suai Grub2 Menu
 F7 - Beralih antara mode GUI <-> Mode TEXT
 
 m - Periksa berkas files (md5/sha1/sha256/sha512)
-Ctrl+w - Mode WIMBOOT (Hanya untuk berkas ISO Windows standar)
-Ctrl+r - Mode Grub2 (Hanya untuk distro Linux tertentu)
-Ctrl+i - Mode Kompatibel/Compatible (Hanya untuk debug saja)
-Ctrl+u - Memuat ISO efi driver (Hanya untuk debug saja, tidak dapat dipakai secara umum)
+w/Ctrl+w - Mode WIMBOOT (Hanya untuk berkas ISO Windows standar)
+r/Ctrl+r - Mode Grub2 (Hanya untuk distro Linux tertentu)
+i/Ctrl+i - Mode Kompatibel/Compatible (Hanya untuk debug saja)
+u/Ctrl+u - Memuat ISO efi driver (Hanya untuk debug saja, tidak dapat dipakai secara umum)
 
 
 

INSTALL/grub/help/ja_JP.txt

@@ -8,10 +8,10 @@ F6 - Grub2の構成を読み込む
 F7 - 操作形式を切り替える（GUI ↔ CUI）
 
 m - イメージの検査合計を計算する (md5/sha1/sha256/sha512)
-Ctrl+w - WIMBOOTモード（標準的なWindows ISO専用）
-Ctrl+r - Grub2モード（一部のLinuxディストリビューション専用）
-Ctrl+i - 互換モード（開発用）
-Ctrl+u - ISO efiドライバーを読み取る（開発用，非公式）
+w/Ctrl+w - WIMBOOTモード（標準的なWindows ISO専用）
+r/Ctrl+r - Grub2モード（一部のLinuxディストリビューション専用）
+i/Ctrl+i - 互換モード（開発用）
+u/Ctrl+u - ISO efiドライバーを読み取る（開発用，非公式）
 
 
 

INSTALL/grub/help/ko_KR.txt

@@ -8,10 +8,10 @@ F6 - 사용자 지정 Grub2 메뉴 로드
 F7 - GUI 모드 <-> TEXT 모드 간에 전환
 
 m - 체크섬 이미지 파일 (md5/sha1/sha256/sha512)
-Ctrl+w - WIMBOOT 모드 (표준 Windows ISO 전용)
-Ctrl+r - Grub2 모드 (일부 Linux 배포판에만 해당)
-Ctrl+i - 호환 모드 (디버그 전용)
-Ctrl+u - ISO eFi 드라이버 로드 (디버그 전용, 공식적으로 사용할 수 없음)
+w/Ctrl+w - WIMBOOT 모드 (표준 Windows ISO 전용)
+r/Ctrl+r - Grub2 모드 (일부 Linux 배포판에만 해당)
+i/Ctrl+i - 호환 모드 (디버그 전용)
+u/Ctrl+u - ISO eFi 드라이버 로드 (디버그 전용, 공식적으로 사용할 수 없음)
 
 
 

INSTALL/grub/help/pt_PT.txt

@@ -8,10 +8,10 @@ F6 - Carregar menu Grub2 personalizado
 F7 - Alternar entre Modo GUI <-> Modo TEXTO
 
 m - Checksum ficheiros de imagem (md5/sha1/sha256/sha512)
-Ctrl+w - Modo WIMBOOT (Apenas para Windows ISO padrão)
-Ctrl+r - Modo Grub2 (Apenas para algumas distros Linux)
-Ctrl+i - Modo Compatível (Apenas para depuração)
-Ctrl+u - Carregar o controlador ISO efi (Apenas para depuração, não pode ser utilizado oficialmente)
+w/Ctrl+w - Modo WIMBOOT (Apenas para Windows ISO padrão)
+r/Ctrl+r - Modo Grub2 (Apenas para algumas distros Linux)
+i/Ctrl+i - Modo Compatível (Apenas para depuração)
+u/Ctrl+u - Carregar o controlador ISO efi (Apenas para depuração, não pode ser utilizado oficialmente)
 
 
 Prima ESC para voltar ......

INSTALL/grub/help/sr_RS.txt

@@ -8,10 +8,10 @@ F6 - Учитава прилагођен GRUB2 мени
 F7 - Мења између GUI <-> TEXT начина рада
 
 m - Генерира хеш одабраног имиџ фајла (md5/sha1/sha256/sha512)
-Ctrl+w - WIMBOOT начин рада (само за стандардне Windows имиџ фајлове)
-Ctrl+r - GRUB2 начин рада (само за неке Linux дистрибуције)
-Ctrl+i - Компатибилни начин рада (само за тестирање)
-Ctrl+u - Учитава EFI драјвер за имиџ фајлове (само за тестирање)
+w/Ctrl+w - WIMBOOT начин рада (само за стандардне Windows имиџ фајлове)
+r/Ctrl+r - GRUB2 начин рада (само за неке Linux дистрибуције)
+i/Ctrl+i - Компатибилни начин рада (само за тестирање)
+u/Ctrl+u - Учитава EFI драјвер за имиџ фајлове (само за тестирање)
 
 
 

INSTALL/grub/help/tr_TR.txt

@@ -8,10 +8,10 @@ F6 - Özelleştirilmiş Grub2 menüsünü yükler
 F7 - Grafik Modu(GUI Mode) ile Metin Modu(Text Mode) arasında geçiş yapmayı sağlar
 
 m - İndirilen imaj dosyalarının hatasız indirildiğini teyit etmek için "md5/sha1/sha256/sha512" değerlerini kontrol etmeyi sağlar
-Ctrl+w - WIMBOOT Modu çalıştırmayı sağlar(Sadece normal Windows ISO ları için)
-Ctrl+r - Grub2 Modu çalıştırmayı sağlar (Sadece bazı Linux dağıtımları için)
-Ctrl+i - Uyumluluk Modu'nu (Compatible Mode) çalıştırmayı sağlar (Sadece hata ayıklama için bu modu kullanabilirsiniz)
-Ctrl+u - ISO efi sürücüsünü yükler(Sadece hata ayıklama için bu mod kullanılabilir, resmi olarak kullanılamaz)
+w/Ctrl+w - WIMBOOT Modu çalıştırmayı sağlar(Sadece normal Windows ISO ları için)
+r/Ctrl+r - Grub2 Modu çalıştırmayı sağlar (Sadece bazı Linux dağıtımları için)
+i/Ctrl+i - Uyumluluk Modu'nu (Compatible Mode) çalıştırmayı sağlar (Sadece hata ayıklama için bu modu kullanabilirsiniz)
+u/Ctrl+u - ISO efi sürücüsünü yükler(Sadece hata ayıklama için bu mod kullanılabilir, resmi olarak kullanılamaz)
 
 
 Geriye dönmek için ESC tuşuna basınız......

INSTALL/grub/help/zh_CN.txt

@@ -8,10 +8,10 @@ F6 - 加载自定义 GRUB2 菜单。
 F7 - 界面在文本模式和图形模式之间切换。
 
 m - 计算文件校验值（md5/sha1/sha256/sha512）
-Ctrl+w - WIMBOOT 模式 （只适用于标准的 Windows ISO文件）
-Ctrl+r - Grub2 模式 （只适用于常见的一些 Linux 系统ISO文件）
-Ctrl+i - 兼容模式 （只用作调试目的，不能正式使用）
-Ctrl+u - 加载 ISO efi 驱动（只用作调试目的，不能正式使用）
+w/Ctrl+w - WIMBOOT 模式 （只适用于标准的 Windows ISO文件）
+r/Ctrl+r - Grub2 模式 （只适用于常见的一些 Linux 系统ISO文件）
+i/Ctrl+i - 兼容模式 （只用作调试目的，不能正式使用）
+u/Ctrl+u - 加载 ISO efi 驱动（只用作调试目的，不能正式使用）
 
 
 按 ESC 键返回 ......

INSTALL/grub/i386-efi/moddep.lst

@@ -201,7 +201,7 @@ cbmemc: cbtable normal terminfo
 hfsplus: fshelp
 gcry_cast5: crypto
 extcmd:
-squash4: fshelp lzopio xzio gzio
+squash4: fshelp lzopio zfs xzio gzio
 part_plan:
 minix_be:
 gcry_whirlpool: crypto

INSTALL/grub/i386-pc/moddep.lst

@@ -208,7 +208,7 @@ cmosdump:
 hfsplus: fshelp
 gcry_cast5: crypto
 extcmd:
-squash4: fshelp lzopio xzio gzio
+squash4: fshelp lzopio zfs xzio gzio
 part_plan:
 minix_be:
 gcry_whirlpool: crypto

INSTALL/grub/x86_64-efi/moddep.lst

@@ -202,7 +202,7 @@ cbmemc: cbtable normal terminfo
 hfsplus: fshelp
 gcry_cast5: crypto
 extcmd:
-squash4: fshelp lzopio xzio gzio
+squash4: fshelp lzopio zfs xzio gzio
 part_plan:
 minix_be:
 gcry_whirlpool: crypto

INSTALL/tool/VentoyWorker.sh

@@ -13,7 +13,7 @@ print_usage() {
     echo ''
     echo '  OPTION: (optional)'
     echo '   -r SIZE_MB  preserve some space at the bottom of the disk (only for install)'
-    echo '   -s/-S       enable/disable secure boot support (default is disabled)'
+    echo '   -s/-S       enable/disable secure boot support (default is enabled)'
     echo '   -g          use GPT partition style, default is MBR (only for install)'
     echo '   -L          Label of the 1st exfat partition (default is Ventoy)'
     echo '   -n          try non-destructive installation (only for install)'
@@ -21,6 +21,7 @@ print_usage() {
 }
 
 
+SECUREBOOT="YES"
 VTNEW_LABEL='Ventoy'
 RESERVE_SIZE_MB=0
 while [ -n "$1" ]; do