1.0.14 release

* doc: remove broken link

* add docker build environment

DOC/BuildVentoyFromSource.txt

@@ -31,7 +31,6 @@
     https://codeload.github.com/tianocore/edk2/zip/edk2-stable201911     ===>  /home/Ventoy-master/EDK2/edk2-edk2-stable201911.zip
     https://codeload.github.com/relan/exfat/zip/v1.3.0                   ===>  /home/Ventoy-master/ExFAT/exfat-1.3.0.zip
     https://codeload.github.com/libfuse/libfuse/zip/fuse-2.9.9           ===>  /home/Ventoy-master/ExFAT/libfuse-fuse-2.9.9.zip
-    http://ultra-embedded.com/releases/fat_io_lib.zip                    ===>  /home/Ventoy-master/vtoyfat/fat_io_lib/fat_io_lib.zip
 
 
 
@@ -199,5 +198,7 @@
  INSTALL/EFI/BOOT/MokManager.efi --> EFI/BOOT/MokManager.efi  SHA-256: 3bf1f46cee0832355c7dd1dba880dea9bcaa78cc44375a1559d43bc9db18933b
 
 
-   
+5.11 INSTALL/tool/ash
+ https://busybox.net/downloads/binaries/1.31.0-i686-uclibc/   busybox_ASH
+ SHA-256: 2943f02f85fee0c9551aec47110a558a73f919c032b3c51e56d6f197b5ec4d7b  
    

Dockerfile

@@ -0,0 +1,17 @@
+FROM centos:7
+
+RUN yum -y install \
+        libXpm net-tools bzip2 wget vim gcc gcc-c++ samba dos2unix glibc-devel glibc.i686 glibc-devel.i686 \
+        mpfr.i686 mpfr-devel.i686 zlib.i686 rsync autogen autoconf automake libtool gettext* bison binutils \
+        flex device-mapper-devel SDL libpciaccess libusb freetype freetype-devel gnu-free-* qemu-* virt-* \
+        libvirt* vte* NetworkManager-bluetooth brlapi fuse-devel dejavu* gnu-efi* pesign shim \
+        iscsi-initiator-utils grub2-tools zip nasm acpica-tools glibc-static zlib-static
+
+CMD cd /ventoy \
+    && wget -P DOC/ https://www.fefe.de/dietlibc/dietlibc-0.34.tar.xz \
+    && wget -P GRUB2/ https://ftp.gnu.org/gnu/grub/grub-2.04.tar.xz \
+    && wget -O EDK2/edk2-edk2-stable201911.zip https://codeload.github.com/tianocore/edk2/zip/edk2-stable201911 \
+    && wget -O ExFAT/exfat-1.3.0.zip https://codeload.github.com/relan/exfat/zip/v1.3.0 \
+    && wget -O ExFAT/libfuse-fuse-2.9.9.zip https://codeload.github.com/libfuse/libfuse/zip/fuse-2.9.9 \
+    && cd INSTALL && ls -la && sh all_in_one.sh
+

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

@@ -36,33 +36,25 @@
 #include <Protocol/SimpleFileSystem.h>
 #include <Ventoy.h>
 
-UINTN g_iso_buf_size = 0;
-BOOLEAN gMemdiskMode = FALSE;
 BOOLEAN gDebugPrint = FALSE;
-BOOLEAN gLoadIsoEfi = FALSE;
 ventoy_ram_disk g_ramdisk_param;
 ventoy_chain_head *g_chain;
 ventoy_img_chunk *g_chunk;
+UINT8 *g_os_param_reserved;
 UINT32 g_img_chunk_num;
 ventoy_override_chunk *g_override_chunk;
 UINT32 g_override_chunk_num;
 ventoy_virt_chunk *g_virt_chunk;
 UINT32 g_virt_chunk_num;
 vtoy_block_data gBlockData;
-ventoy_sector_flag *g_sector_flag = NULL;
-UINT32 g_sector_flag_num = 0;
 static grub_env_get_pf grub_env_get = NULL;
 
-EFI_FILE_OPEN g_original_fopen = NULL;
-EFI_FILE_CLOSE g_original_fclose = NULL;
-EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME g_original_open_volume = NULL;
-
 ventoy_grub_param_file_replace *g_file_replace_list = NULL;
 ventoy_efi_file_replace g_efi_file_replace;
 
-CHAR16 gFirstTryBootFile[256] = {0};
+STATIC BOOLEAN g_hook_keyboard = FALSE;
 
-CONST CHAR16 gIso9660EfiDriverPath[] = ISO9660_EFI_DRIVER_PATH;
+CHAR16 gFirstTryBootFile[256] = {0};
 
 /* Boot filename */
 UINTN gBootFileStartIndex = 1;
@@ -76,9 +68,6 @@ CONST CHAR16 *gEfiBootFileName[] =
     L"\\efi\\boot\\bootx64.efi",
 };
 
-/* EFI block device vendor device path GUID */
-EFI_GUID gVtoyBlockDevicePathGuid = VTOY_BLOCK_DEVICE_PATH_GUID;
-
 VOID EFIAPI VtoyDebug(IN CONST CHAR8  *Format, ...)
 {
     VA_LIST  Marker;
@@ -204,6 +193,13 @@ static void EFIAPI ventoy_dump_chain(ventoy_chain_head *chain)
     debug("os_param->vtoy_img_size=<%llu>",    chain->os_param.vtoy_img_size);
     debug("os_param->vtoy_img_location_addr=<0x%llx>", chain->os_param.vtoy_img_location_addr);
     debug("os_param->vtoy_img_location_len=<%u>",    chain->os_param.vtoy_img_location_len);
+    debug("os_param->vtoy_reserved=<%u %u %u %u %u>",    
+          g_os_param_reserved[0], 
+          g_os_param_reserved[1], 
+          g_os_param_reserved[2], 
+          g_os_param_reserved[3],
+          g_os_param_reserved[4]
+          );
 
     ventoy_debug_pause();
     
@@ -224,6 +220,70 @@ static void EFIAPI ventoy_dump_chain(ventoy_chain_head *chain)
     ventoy_dump_virt_chunk(chain);
 }
 
+static int ventoy_update_image_location(ventoy_os_param *param)
+{
+    EFI_STATUS Status = EFI_SUCCESS;
+    UINT8 chksum = 0;
+    unsigned int i;
+    unsigned int length;
+    UINTN address = 0;
+    void *buffer = NULL;
+    ventoy_image_location *location = NULL;
+    ventoy_image_disk_region *region = NULL;
+    ventoy_img_chunk *chunk = g_chunk;
+
+    length = sizeof(ventoy_image_location) + (g_img_chunk_num - 1) * sizeof(ventoy_image_disk_region);
+
+    Status = gBS->AllocatePool(EfiRuntimeServicesData, length + 4096 * 2, &buffer);
+    if (EFI_ERROR(Status) || NULL == buffer)
+    {
+        debug("Failed to allocate runtime pool %r\n", Status);
+        return 1;
+    }
+
+    address = (UINTN)buffer;
+
+    if (address % 4096)
+    {
+        address += 4096 - (address % 4096);
+    }
+
+    param->chksum = 0;
+    param->vtoy_img_location_addr = address;
+    param->vtoy_img_location_len = length;
+
+    /* update check sum */
+    for (i = 0; i < sizeof(ventoy_os_param); i++)
+    {
+        chksum += *((UINT8 *)param + i);
+    }
+    param->chksum = (chksum == 0) ? 0 : (UINT8)(0x100 - chksum);
+
+    location = (ventoy_image_location *)(unsigned long)(param->vtoy_img_location_addr);
+    if (NULL == location)
+    {
+        return 0;
+    }
+
+    CopyMem(&location->guid, &param->guid, sizeof(ventoy_guid));
+    location->image_sector_size = 2048;
+    location->disk_sector_size  = g_chain->disk_sector_size;
+    location->region_count = g_img_chunk_num;
+
+    region = location->regions;
+
+    for (i = 0; i < g_img_chunk_num; i++)
+    {
+        region->image_sector_count = chunk->img_end_sector - chunk->img_start_sector + 1;
+        region->image_start_sector = chunk->img_start_sector;
+        region->disk_start_sector  = chunk->disk_start_sector;
+        region++;
+        chunk++;
+    }
+
+    return 0;
+}
+
 EFI_HANDLE EFIAPI ventoy_get_parent_handle(IN EFI_DEVICE_PATH_PROTOCOL *pDevPath)
 {
     EFI_HANDLE Handle = NULL;
@@ -258,280 +318,6 @@ EFI_HANDLE EFIAPI ventoy_get_parent_handle(IN EFI_DEVICE_PATH_PROTOCOL *pDevPath
     return Handle;
 }
 
-EFI_STATUS EFIAPI ventoy_block_io_reset 
-(
-    IN EFI_BLOCK_IO_PROTOCOL          *This,
-    IN BOOLEAN                        ExtendedVerification
-) 
-{
-    (VOID)This;
-    (VOID)ExtendedVerification;
-	return EFI_SUCCESS;
-}
-
-STATIC EFI_STATUS EFIAPI ventoy_read_iso_sector
-(
-    IN UINT64                 Sector,
-    IN UINTN                  Count,
-    OUT VOID                 *Buffer
-)
-{
-    EFI_STATUS Status = EFI_SUCCESS;
-    EFI_LBA MapLba = 0;
-    UINT32 i = 0;
-    UINTN secLeft = 0;
-    UINTN secRead = 0;
-    UINT64 ReadStart = 0;
-    UINT64 ReadEnd = 0;
-    UINT64 OverrideStart = 0;
-    UINT64 OverrideEnd= 0;
-    UINT8 *pCurBuf = (UINT8 *)Buffer;
-    ventoy_img_chunk *pchunk = g_chunk;
-    ventoy_override_chunk *pOverride = g_override_chunk;
-    EFI_BLOCK_IO_PROTOCOL *pRawBlockIo = gBlockData.pRawBlockIo;
-
-    debug("read iso sector %lu  count %u", Sector, Count);
-
-    ReadStart = Sector * 2048;
-    ReadEnd = (Sector + Count) * 2048;
-
-    for (i = 0; Count > 0 && i < g_img_chunk_num; i++, pchunk++)
-    {
-        if (Sector >= pchunk->img_start_sector && Sector <= pchunk->img_end_sector)
-        {
-            if (g_chain->disk_sector_size == 512)
-            {
-                MapLba = (Sector - pchunk->img_start_sector) * 4 + pchunk->disk_start_sector;
-            }
-            else
-            {
-                MapLba = (Sector - pchunk->img_start_sector) * 2048 / g_chain->disk_sector_size + pchunk->disk_start_sector;
-            }
-
-            secLeft = pchunk->img_end_sector + 1 - Sector;
-            secRead = (Count < secLeft) ? Count : secLeft;
-
-            Status = pRawBlockIo->ReadBlocks(pRawBlockIo, pRawBlockIo->Media->MediaId,
-                                     MapLba, secRead * 2048, pCurBuf);
-            if (EFI_ERROR(Status))
-            {
-                debug("Raw disk read block failed %r", Status);
-                return Status;
-            }
-
-            Count -= secRead;
-            Sector += secRead;
-            pCurBuf += secRead * 2048;
-        }
-    }
-
-    if (ReadStart > g_chain->real_img_size_in_bytes)
-    {
-        return EFI_SUCCESS;
-    }
-
-    /* override data */
-    pCurBuf = (UINT8 *)Buffer;
-    for (i = 0; i < g_override_chunk_num; i++, pOverride++)
-    {
-        OverrideStart = pOverride->img_offset;
-        OverrideEnd = pOverride->img_offset + pOverride->override_size;
-    
-        if (OverrideStart >= ReadEnd || ReadStart >= OverrideEnd)
-        {
-            continue;
-        }
-
-        if (ReadStart <= OverrideStart)
-        {
-            if (ReadEnd <= OverrideEnd)
-            {
-                CopyMem(pCurBuf + OverrideStart - ReadStart, pOverride->override_data, ReadEnd - OverrideStart);  
-            }
-            else
-            {
-                CopyMem(pCurBuf + OverrideStart - ReadStart, pOverride->override_data, pOverride->override_size);
-            }
-        }
-        else
-        {
-            if (ReadEnd <= OverrideEnd)
-            {
-                CopyMem(pCurBuf, pOverride->override_data + ReadStart - OverrideStart, ReadEnd - ReadStart);     
-            }
-            else
-            {
-                CopyMem(pCurBuf, pOverride->override_data + ReadStart - OverrideStart, OverrideEnd - ReadStart);
-            }
-        }
-    }
-
-    return EFI_SUCCESS;    
-}
-
-EFI_STATUS EFIAPI ventoy_block_io_ramdisk_read 
-(
-    IN EFI_BLOCK_IO_PROTOCOL          *This,
-    IN UINT32                          MediaId,
-    IN EFI_LBA                         Lba,
-    IN UINTN                           BufferSize,
-    OUT VOID                          *Buffer
-) 
-{
-    //debug("### ventoy_block_io_ramdisk_read sector:%u count:%u", (UINT32)Lba, (UINT32)BufferSize / 2048);
-
-    (VOID)This;
-    (VOID)MediaId;
-
-    CopyMem(Buffer, (char *)g_chain + (Lba * 2048), BufferSize);
-
-	return EFI_SUCCESS;
-}
-
-EFI_STATUS EFIAPI ventoy_block_io_read 
-(
-    IN EFI_BLOCK_IO_PROTOCOL          *This,
-    IN UINT32                          MediaId,
-    IN EFI_LBA                         Lba,
-    IN UINTN                           BufferSize,
-    OUT VOID                          *Buffer
-) 
-{
-    UINT32 i = 0;
-    UINT32 j = 0;
-    UINT32 lbacount = 0;
-    UINT32 secNum = 0;
-    UINT64 offset = 0;
-    EFI_LBA curlba = 0;
-    EFI_LBA lastlba = 0;
-    UINT8 *lastbuffer;
-    ventoy_sector_flag *cur_flag;
-    ventoy_virt_chunk *node;
-    
-    //debug("### ventoy_block_io_read sector:%u count:%u", (UINT32)Lba, (UINT32)BufferSize / 2048);
-
-    secNum = BufferSize / 2048;
-    offset = Lba * 2048;
-
-    if (offset + BufferSize <= g_chain->real_img_size_in_bytes)
-    {
-        return ventoy_read_iso_sector(Lba, secNum, Buffer);
-    }
-
-    if (secNum > g_sector_flag_num)
-    {
-        cur_flag = AllocatePool(secNum * sizeof(ventoy_sector_flag));
-        if (NULL == cur_flag)
-        {
-            return EFI_OUT_OF_RESOURCES;
-        }
-
-        FreePool(g_sector_flag);
-        g_sector_flag = cur_flag;
-        g_sector_flag_num = secNum;
-    }
-
-    for (curlba = Lba, cur_flag = g_sector_flag, j = 0; j < secNum; j++, curlba++, cur_flag++)
-    {
-        cur_flag->flag = 0;
-        for (node = g_virt_chunk, i = 0; i < g_virt_chunk_num; i++, node++)
-        {
-            if (curlba >= node->mem_sector_start && curlba < node->mem_sector_end)
-            {
-                CopyMem((UINT8 *)Buffer + j * 2048, 
-                       (char *)g_virt_chunk + node->mem_sector_offset + (curlba - node->mem_sector_start) * 2048,
-                       2048);
-                cur_flag->flag = 1;
-                break;
-            }
-            else if (curlba >= node->remap_sector_start && curlba < node->remap_sector_end)
-            {
-                cur_flag->remap_lba = node->org_sector_start + curlba - node->remap_sector_start;
-                cur_flag->flag = 2;
-                break;
-            }
-        }
-    }
-
-    for (curlba = Lba, cur_flag = g_sector_flag, j = 0; j < secNum; j++, curlba++, cur_flag++)
-    {
-        if (cur_flag->flag == 2)
-        {
-            if (lastlba == 0)
-            {
-                lastbuffer = (UINT8 *)Buffer + j * 2048;
-                lastlba = cur_flag->remap_lba;
-                lbacount = 1;
-            }
-            else if (lastlba + lbacount == cur_flag->remap_lba)
-            {
-                lbacount++;
-            }
-            else
-            {
-                ventoy_read_iso_sector(lastlba, lbacount, lastbuffer);
-                lastbuffer = (UINT8 *)Buffer + j * 2048;
-                lastlba = cur_flag->remap_lba;
-                lbacount = 1;
-            }
-        }
-    }
-
-    if (lbacount > 0)
-    {
-        ventoy_read_iso_sector(lastlba, lbacount, lastbuffer);
-    }
-
-	return EFI_SUCCESS;
-}
-
-EFI_STATUS EFIAPI ventoy_block_io_write 
-(
-    IN EFI_BLOCK_IO_PROTOCOL          *This,
-    IN UINT32                          MediaId,
-    IN EFI_LBA                         Lba,
-    IN UINTN                           BufferSize,
-    IN VOID                           *Buffer
-) 
-{
-    (VOID)This;
-    (VOID)MediaId;
-    (VOID)Lba;
-    (VOID)BufferSize;
-    (VOID)Buffer;
-	return EFI_WRITE_PROTECTED;
-}
-
-EFI_STATUS EFIAPI ventoy_block_io_flush(IN EFI_BLOCK_IO_PROTOCOL *This)
-{
-	(VOID)This;
-	return EFI_SUCCESS;
-}
-
-
-EFI_STATUS EFIAPI ventoy_fill_device_path(VOID)
-{
-    UINTN NameLen = 0;
-    UINT8 TmpBuf[128] = {0};
-    VENDOR_DEVICE_PATH *venPath = NULL;
-
-    venPath = (VENDOR_DEVICE_PATH *)TmpBuf;
-    NameLen = StrSize(VTOY_BLOCK_DEVICE_PATH_NAME);
-    venPath->Header.Type = HARDWARE_DEVICE_PATH;
-    venPath->Header.SubType = HW_VENDOR_DP;
-    venPath->Header.Length[0] = sizeof(VENDOR_DEVICE_PATH) + NameLen;
-    venPath->Header.Length[1] = 0;
-    CopyMem(&venPath->Guid, &gVtoyBlockDevicePathGuid, sizeof(EFI_GUID));
-    CopyMem(venPath + 1, VTOY_BLOCK_DEVICE_PATH_NAME, NameLen);
-    
-    gBlockData.Path = AppendDevicePathNode(NULL, (EFI_DEVICE_PATH_PROTOCOL *)TmpBuf);
-    gBlockData.DevicePathCompareLen = sizeof(VENDOR_DEVICE_PATH) + NameLen;
-
-    debug("gBlockData.Path=<%s>\n", ConvertDevicePathToText(gBlockData.Path, FALSE, FALSE));
-
-    return EFI_SUCCESS;
-}
-
 EFI_STATUS EFIAPI ventoy_save_ramdisk_param(VOID)
 {
     EFI_STATUS Status = EFI_SUCCESS;
@@ -545,7 +331,7 @@ EFI_STATUS EFIAPI ventoy_save_ramdisk_param(VOID)
     return Status;
 }
 
-EFI_STATUS EFIAPI ventoy_del_ramdisk_param(VOID)
+EFI_STATUS EFIAPI ventoy_delete_ramdisk_param(VOID)
 {
     EFI_STATUS Status = EFI_SUCCESS;
     EFI_GUID VarGuid = VENTOY_GUID;
@@ -559,7 +345,7 @@ EFI_STATUS EFIAPI ventoy_del_ramdisk_param(VOID)
 }
 
 
-EFI_STATUS EFIAPI ventoy_set_variable(VOID)
+EFI_STATUS EFIAPI ventoy_save_variable(VOID)
 {
     EFI_STATUS Status = EFI_SUCCESS;
     EFI_GUID VarGuid = VENTOY_GUID;
@@ -585,56 +371,7 @@ EFI_STATUS EFIAPI ventoy_delete_variable(VOID)
     return Status;
 }
 
-
+STATIC EFI_STATUS EFIAPI ventoy_load_image
-EFI_STATUS EFIAPI ventoy_install_blockio(IN EFI_HANDLE ImageHandle, IN UINT64 ImgSize)
-{   
-    EFI_STATUS Status = EFI_SUCCESS;
-    EFI_BLOCK_IO_PROTOCOL *pBlockIo = &(gBlockData.BlockIo);
-    
-    ventoy_fill_device_path();
-    
-    gBlockData.Media.BlockSize = 2048;
-    gBlockData.Media.LastBlock = ImgSize / 2048 - 1;
-    gBlockData.Media.ReadOnly = TRUE;
-    gBlockData.Media.MediaPresent = 1;
-    gBlockData.Media.LogicalBlocksPerPhysicalBlock = 1;
-
-	pBlockIo->Revision = EFI_BLOCK_IO_PROTOCOL_REVISION3;
-	pBlockIo->Media = &(gBlockData.Media);
-	pBlockIo->Reset = ventoy_block_io_reset;
-
-    if (gMemdiskMode)
-    {
-        pBlockIo->ReadBlocks = ventoy_block_io_ramdisk_read;
-    }
-    else
-    {
-    	pBlockIo->ReadBlocks = ventoy_block_io_read;        
-    }
-    
-	pBlockIo->WriteBlocks = ventoy_block_io_write;
-	pBlockIo->FlushBlocks = ventoy_block_io_flush;
-
-    Status = gBS->InstallMultipleProtocolInterfaces(&gBlockData.Handle,
-            &gEfiBlockIoProtocolGuid, &gBlockData.BlockIo,
-            &gEfiDevicePathProtocolGuid, gBlockData.Path,
-            NULL);
-
-    debug("Install protocol %r", Status);
-
-    if (EFI_ERROR(Status))
-    {
-        return Status;
-    }
-
-    Status = gBS->ConnectController(gBlockData.Handle, NULL, NULL, 1);
-    debug("Connect controller %r", Status);
-
-    return EFI_SUCCESS;
-}
-
-
-EFI_STATUS EFIAPI ventoy_load_image
 (
     IN EFI_HANDLE ImageHandle,
     IN EFI_DEVICE_PATH_PROTOCOL *pDevicePath,
@@ -745,156 +482,6 @@ STATIC EFI_STATUS EFIAPI ventoy_find_iso_disk(IN EFI_HANDLE ImageHandle)
     }
 }
 
-STATIC EFI_STATUS EFIAPI ventoy_find_iso_disk_fs(IN EFI_HANDLE ImageHandle)
-{
-    UINTN i = 0;
-    UINTN Count = 0;
-    EFI_HANDLE Parent = NULL;
-    EFI_HANDLE *Handles = NULL;
-    EFI_STATUS Status = EFI_SUCCESS;
-    EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *pFile = NULL;
-    EFI_DEVICE_PATH_PROTOCOL *pDevPath = NULL;
-
-    Status = gBS->LocateHandleBuffer(ByProtocol, &gEfiSimpleFileSystemProtocolGuid, 
-                                     NULL, &Count, &Handles);
-    if (EFI_ERROR(Status))
-    {
-        return Status;
-    }
-
-    debug("ventoy_find_iso_disk_fs fs count:%u", Count);
-
-    for (i = 0; i < Count; i++)
-    {
-        Status = gBS->HandleProtocol(Handles[i], &gEfiSimpleFileSystemProtocolGuid, (VOID **)&pFile);
-        if (EFI_ERROR(Status))
-        {
-            continue;
-        }
-
-        Status = gBS->OpenProtocol(Handles[i], &gEfiDevicePathProtocolGuid, 
-                                   (VOID **)&pDevPath,
-                                   ImageHandle,
-                                   Handles[i],
-                                   EFI_OPEN_PROTOCOL_GET_PROTOCOL);
-        if (EFI_ERROR(Status))
-        {
-            debug("Failed to open device path protocol %r", Status);
-            continue;
-        }
-
-        debug("Handle:%p FS DP: <%s>", Handles[i], ConvertDevicePathToText(pDevPath, FALSE, FALSE));
-        Parent = ventoy_get_parent_handle(pDevPath);
-
-        if (Parent == gBlockData.RawBlockIoHandle)
-        {
-            debug("Find ventoy disk fs");
-            gBlockData.DiskFsHandle = Handles[i];
-            gBlockData.pDiskFs = pFile;
-            gBlockData.pDiskFsDevPath = pDevPath;
-            break;
-        }
-    }
-
-    FreePool(Handles);
-
-    return EFI_SUCCESS;
-}
-
-STATIC EFI_STATUS EFIAPI ventoy_load_isoefi_driver(IN EFI_HANDLE ImageHandle)
-{
-    EFI_HANDLE Image = NULL;
-    EFI_STATUS Status = EFI_SUCCESS;
-    CHAR16 LogVar[4] = L"5";
-            
-    Status = ventoy_load_image(ImageHandle, gBlockData.pDiskFsDevPath, 
-                               gIso9660EfiDriverPath, 
-                               sizeof(gIso9660EfiDriverPath), 
-                               &Image);
-    debug("load iso efi driver status:%r", Status);
-
-    if (gDebugPrint)
-    {
-        gRT->SetVariable(L"FS_LOGGING", &gShellVariableGuid, 
-                         EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
-                         sizeof(LogVar), LogVar);
-    }
-
-    gRT->SetVariable(L"FS_NAME_NOCASE", &gShellVariableGuid, 
-                     EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
-                     sizeof(LogVar), LogVar);
-
-    gBlockData.IsoDriverImage = Image;
-    Status = gBS->StartImage(Image, NULL, NULL);
-    debug("Start iso efi driver status:%r", Status);
-
-    return EFI_SUCCESS;
-}
-
-static int ventoy_update_image_location(ventoy_os_param *param)
-{
-    EFI_STATUS Status = EFI_SUCCESS;
-    UINT8 chksum = 0;
-    unsigned int i;
-    unsigned int length;
-    UINTN address = 0;
-    void *buffer = NULL;
-    ventoy_image_location *location = NULL;
-    ventoy_image_disk_region *region = NULL;
-    ventoy_img_chunk *chunk = g_chunk;
-
-    length = sizeof(ventoy_image_location) + (g_img_chunk_num - 1) * sizeof(ventoy_image_disk_region);
-
-    Status = gBS->AllocatePool(EfiRuntimeServicesData, length + 4096 * 2, &buffer);
-    if (EFI_ERROR(Status) || NULL == buffer)
-    {
-        debug("Failed to allocate runtime pool %r\n", Status);
-        return 1;
-    }
-
-    address = (UINTN)buffer;
-
-    if (address % 4096)
-    {
-        address += 4096 - (address % 4096);
-    }
-
-    param->chksum = 0;
-    param->vtoy_img_location_addr = address;
-    param->vtoy_img_location_len = length;
-
-    /* update check sum */
-    for (i = 0; i < sizeof(ventoy_os_param); i++)
-    {
-        chksum += *((UINT8 *)param + i);
-    }
-    param->chksum = (chksum == 0) ? 0 : (UINT8)(0x100 - chksum);
-
-    location = (ventoy_image_location *)(unsigned long)(param->vtoy_img_location_addr);
-    if (NULL == location)
-    {
-        return 0;
-    }
-
-    CopyMem(&location->guid, &param->guid, sizeof(ventoy_guid));
-    location->image_sector_size = 2048;
-    location->disk_sector_size  = g_chain->disk_sector_size;
-    location->region_count = g_img_chunk_num;
-
-    region = location->regions;
-
-    for (i = 0; i < g_img_chunk_num; i++)
-    {
-        region->image_sector_count = chunk->img_end_sector - chunk->img_start_sector + 1;
-        region->image_start_sector = chunk->img_start_sector;
-        region->disk_start_sector  = chunk->disk_start_sector;
-        region++;
-        chunk++;
-    }
-
-    return 0;
-}
-
 STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle)
 {   
     UINT32 i = 0;
@@ -923,11 +510,6 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle)
         gDebugPrint = TRUE;
     }
 
-    if (StrStr(pCmdLine, L"isoefi=on"))
-    {
-        gLoadIsoEfi = TRUE;
-    }
-
     pPos = StrStr(pCmdLine, L"FirstTry=@");
     if (pPos)
     {
@@ -998,6 +580,21 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle)
         g_virt_chunk = (ventoy_virt_chunk *)((char *)g_chain + g_chain->virt_chunk_offset);
         g_virt_chunk_num = g_chain->virt_chunk_num;
 
+        g_os_param_reserved = (UINT8 *)(g_chain->os_param.vtoy_reserved);
+
+        /* Workaround for Windows & ISO9660 */
+        if (g_os_param_reserved[2] == 1 && g_os_param_reserved[3] == 0)
+        {
+            g_fixup_iso9660_secover_enable = TRUE;
+        }
+
+        if (g_os_param_reserved[2] == 1 && g_os_param_reserved[4] != 1)
+        {
+            g_hook_keyboard = TRUE;
+        }
+
+        debug("internal param: secover:%u keyboard:%u", g_fixup_iso9660_secover_enable, g_hook_keyboard);
+
         for (i = 0; i < sizeof(ventoy_os_param); i++)
         {
             chksum += *((UINT8 *)(&(g_chain->os_param)) + i);
@@ -1020,82 +617,28 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle)
     return EFI_SUCCESS;
 }
 
-EFI_STATUS EFIAPI ventoy_wrapper_file_open
+EFI_STATUS EFIAPI ventoy_clean_env(VOID)
-(
-    EFI_FILE_HANDLE This, 
-    EFI_FILE_HANDLE *New,
-    CHAR16 *Name, 
-    UINT64 Mode, 
-    UINT64 Attributes
-)
 {
-    UINT32 i = 0;
+    FreePool(g_sector_flag);
-    UINT32 j = 0;
+    g_sector_flag_num = 0;
-    UINT64 Sectors = 0;
-    EFI_STATUS Status = EFI_SUCCESS;
-    CHAR8 TmpName[256];
-    ventoy_virt_chunk *virt = NULL;
 
-    Status = g_original_fopen(This, New, Name, Mode, Attributes);
+    gBS->DisconnectController(gBlockData.Handle, NULL, NULL);
-    if (EFI_ERROR(Status))
+
+    gBS->UninstallMultipleProtocolInterfaces(gBlockData.Handle,
+            &gEfiBlockIoProtocolGuid, &gBlockData.BlockIo,
+            &gEfiDevicePathProtocolGuid, gBlockData.Path,
+            NULL);
+
+    ventoy_delete_variable();
+
+    if (g_chain->os_param.vtoy_img_location_addr)
     {
-        return Status;
+        FreePool((VOID *)(UINTN)g_chain->os_param.vtoy_img_location_addr);
     }
 
-    if (g_file_replace_list && g_file_replace_list->magic == GRUB_FILE_REPLACE_MAGIC &&
+    return EFI_SUCCESS;
-        g_file_replace_list->new_file_virtual_id < g_virt_chunk_num)
-    {
-        AsciiSPrint(TmpName, sizeof(TmpName), "%s", Name);
-        for (j = 0; j < 4; j++)
-        {
-            if (0 == AsciiStrCmp(g_file_replace_list[i].old_file_name[j], TmpName))
-            {
-                g_original_fclose(*New);
-                *New = &g_efi_file_replace.WrapperHandle;
-                ventoy_wrapper_file_procotol(*New);
-
-                virt = g_virt_chunk + g_file_replace_list->new_file_virtual_id;
-
-                Sectors = (virt->mem_sector_end - virt->mem_sector_start) + (virt->remap_sector_end - virt->remap_sector_start);
-                
-                g_efi_file_replace.BlockIoSectorStart = virt->mem_sector_start;
-                g_efi_file_replace.FileSizeBytes = Sectors * 2048;
-
-                if (gDebugPrint)
-                {
-                    debug("## ventoy_wrapper_file_open <%s> BlockStart:%lu Sectors:%lu Bytes:%lu", Name,
-                        g_efi_file_replace.BlockIoSectorStart, Sectors, Sectors * 2048);
-                    sleep(3);
-                }
-                
-                return Status;
-            }
-        }
-    }
-
-    return Status;
 }
 
-EFI_STATUS EFIAPI ventoy_wrapper_open_volume
-(
-    IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL     *This,
-    OUT EFI_FILE_PROTOCOL                 **Root
-)
-{
-    EFI_STATUS Status = EFI_SUCCESS;
-    
-    Status = g_original_open_volume(This, Root);
-    if (!EFI_ERROR(Status))
-    {
-        g_original_fopen = (*Root)->Open;
-        g_original_fclose = (*Root)->Close;
-        (*Root)->Open = ventoy_wrapper_file_open;
-    }
-
-    return Status;
-}
-
-
 EFI_STATUS EFIAPI ventoy_boot(IN EFI_HANDLE ImageHandle)
 {
     UINTN t = 0;
@@ -1174,16 +717,26 @@ EFI_STATUS EFIAPI ventoy_boot(IN EFI_HANDLE ImageHandle)
             if (gDebugPrint)
             {
                 gST->ConIn->Reset(gST->ConIn, FALSE);
-                //ventoy_wrapper_system();
-            }
-
-            if (g_file_replace_list && g_file_replace_list->magic == GRUB_FILE_REPLACE_MAGIC)
-            {
-                g_original_open_volume = pFile->OpenVolume;
-                pFile->OpenVolume = ventoy_wrapper_open_volume;
             }
             
+            if (g_file_replace_list && g_file_replace_list->magic == GRUB_FILE_REPLACE_MAGIC)
+            {
+                ventoy_wrapper_push_openvolume(pFile->OpenVolume);
+                pFile->OpenVolume = ventoy_wrapper_open_volume;
+            }
+
+            if (g_hook_keyboard)
+            {
+                ventoy_hook_keyboard_start();
+            }
+            /* can't add debug print here */
+            //ventoy_wrapper_system();
             Status = gBS->StartImage(Image, NULL, NULL);
+            if (g_hook_keyboard)
+            {
+                ventoy_hook_keyboard_stop();
+            }
+            
             if (EFI_ERROR(Status))
             {
                 debug("Failed to start image %r", Status);
@@ -1210,75 +763,6 @@ EFI_STATUS EFIAPI ventoy_boot(IN EFI_HANDLE ImageHandle)
     return EFI_SUCCESS;
 }
 
-EFI_STATUS EFIAPI ventoy_clean_env(VOID)
-{
-    FreePool(g_sector_flag);
-    g_sector_flag_num = 0;
-
-    if (gLoadIsoEfi && gBlockData.IsoDriverImage)
-    {
-        gBS->UnloadImage(gBlockData.IsoDriverImage);
-    }
-
-    gBS->DisconnectController(gBlockData.Handle, NULL, NULL);
-
-    gBS->UninstallMultipleProtocolInterfaces(gBlockData.Handle,
-            &gEfiBlockIoProtocolGuid, &gBlockData.BlockIo,
-            &gEfiDevicePathProtocolGuid, gBlockData.Path,
-            NULL);
-
-    ventoy_delete_variable();
-
-    if (g_chain->os_param.vtoy_img_location_addr)
-    {
-        FreePool((VOID *)(UINTN)g_chain->os_param.vtoy_img_location_addr);
-    }
-
-    return EFI_SUCCESS;
-}
-
-EFI_STATUS EFIAPI ventoy_ramdisk_boot(IN EFI_HANDLE ImageHandle)
-{
-    EFI_STATUS Status = EFI_SUCCESS;
-    EFI_RAM_DISK_PROTOCOL *RamDisk = NULL;
-    EFI_DEVICE_PATH_PROTOCOL *DevicePath = NULL;
-
-    debug("RamDisk Boot ...");
-
-    Status = gBS->LocateProtocol(&gEfiRamDiskProtocolGuid, NULL, (VOID **)&RamDisk);
-    if (EFI_ERROR(Status))
-    {
-        debug("Failed to locate ramdisk protocol %r", Status);
-        return Status;
-    }
-    debug("Locate RamDisk Protocol %r ...", Status);
-
-    Status = RamDisk->Register((UINTN)g_chain, (UINT64)g_iso_buf_size, &gEfiVirtualCdGuid, NULL, &DevicePath);
-    if (EFI_ERROR(Status))
-    {
-        debug("Failed to register ramdisk %r", Status);
-        return Status;
-    }
-    
-    debug("Register RamDisk %r ...", Status);
-    debug("RamDisk DevicePath:<%s> ...", ConvertDevicePathToText(DevicePath, FALSE, FALSE));
-
-    ventoy_debug_pause();
-
-    gBlockData.Path = DevicePath;
-    gBlockData.DevicePathCompareLen = GetDevicePathSize(DevicePath) - sizeof(EFI_DEVICE_PATH_PROTOCOL);
-
-    Status = ventoy_boot(ImageHandle);
-    if (EFI_NOT_FOUND == Status)
-    {
-        gST->ConOut->OutputString(gST->ConOut, L"No bootfile found for UEFI!\r\n");
-        gST->ConOut->OutputString(gST->ConOut, L"Maybe the image does not support " VENTOY_UEFI_DESC  L"!\r\n");
-        sleep(300);
-    }
-    
-    return EFI_SUCCESS;
-}
-
 EFI_STATUS EFIAPI VentoyEfiMain
 (
     IN EFI_HANDLE         ImageHandle,
@@ -1286,6 +770,7 @@ EFI_STATUS EFIAPI VentoyEfiMain
 )
 {
     EFI_STATUS Status = EFI_SUCCESS;
+    EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *Protocol;
     
     g_sector_flag_num = 512; /* initial value */
 
@@ -1295,6 +780,12 @@ EFI_STATUS EFIAPI VentoyEfiMain
         return EFI_OUT_OF_RESOURCES;
     }
 
+    Status = gBS->HandleProtocol(gST->ConsoleInHandle, &gEfiSimpleTextInputExProtocolGuid, (VOID **)&Protocol);
+    if (EFI_SUCCESS == Status)
+    {
+        g_con_simple_input_ex = Protocol;
+    }
+
     gST->ConOut->ClearScreen(gST->ConOut);
     ventoy_clear_input();
 
@@ -1309,26 +800,14 @@ EFI_STATUS EFIAPI VentoyEfiMain
         
         ventoy_install_blockio(ImageHandle, g_iso_buf_size);
         Status = ventoy_boot(ImageHandle);
-        if (EFI_NOT_FOUND == Status)
+        
-        {
+        ventoy_delete_ramdisk_param();
-            gST->ConOut->OutputString(gST->ConOut, L"No bootfile found for UEFI!\r\n");
-            gST->ConOut->OutputString(gST->ConOut, L"Maybe the image does not support " VENTOY_UEFI_DESC  L"!\r\n");
-            sleep(300);
-        }
-
-        ventoy_del_ramdisk_param();
     }
     else
     {
-        ventoy_set_variable();
+        ventoy_save_variable();
         ventoy_find_iso_disk(ImageHandle);
 
-        if (gLoadIsoEfi)
-        {
-            ventoy_find_iso_disk_fs(ImageHandle);
-            ventoy_load_isoefi_driver(ImageHandle);
-        }
-
         ventoy_debug_pause();
         
         ventoy_install_blockio(ImageHandle, g_chain->virt_img_size_in_bytes);
@@ -1336,32 +815,20 @@ EFI_STATUS EFIAPI VentoyEfiMain
         ventoy_debug_pause();
 
         Status = ventoy_boot(ImageHandle);
-        if (EFI_NOT_FOUND == Status)
-        {
-            if (!gLoadIsoEfi)
-            {
-                gLoadIsoEfi = TRUE;
-                ventoy_find_iso_disk_fs(ImageHandle);
-                ventoy_load_isoefi_driver(ImageHandle);
-
-                Status = ventoy_boot(ImageHandle);
-            }
-
-            if (EFI_NOT_FOUND == Status)
-            {
-                gST->ConOut->OutputString(gST->ConOut, L"No bootfile found for UEFI!\r\n");
-                gST->ConOut->OutputString(gST->ConOut, L"Maybe the image does not support " VENTOY_UEFI_DESC  L"!\r\n");
-                sleep(60);
-            }
-        }
 
         ventoy_clean_env();
     }
-    
+
+    if (EFI_NOT_FOUND == Status)
+    {
+        gST->ConOut->OutputString(gST->ConOut, L"No bootfile found for UEFI!\r\n");
+        gST->ConOut->OutputString(gST->ConOut, L"Maybe the image does not support " VENTOY_UEFI_DESC  L"!\r\n");
+        sleep(30);
+    }
+
     ventoy_clear_input();
     gST->ConOut->ClearScreen(gST->ConOut);
 
     return EFI_SUCCESS;
 }
 
-

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

@@ -199,10 +199,8 @@ typedef struct vtoy_block_data
     EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *pDiskFs;
     EFI_DEVICE_PATH_PROTOCOL *pDiskFsDevPath;
 
-    EFI_HANDLE IsoDriverImage;
 }vtoy_block_data;
 
-#define ISO9660_EFI_DRIVER_PATH  L"\\ventoy\\iso9660_x64.efi"
 
 #define debug(expr, ...) if (gDebugPrint) VtoyDebug("[VTOY] "expr"\r\n", ##__VA_ARGS__)
 #define trace(expr, ...) VtoyDebug("[VTOY] "expr"\r\n", ##__VA_ARGS__)
@@ -254,6 +252,14 @@ typedef struct ventoy_ram_disk
     UINT64 DiskSize;
 }ventoy_ram_disk;
 
+typedef struct ventoy_iso9660_override
+{
+    UINT32 first_sector;
+    UINT32 first_sector_be;
+    UINT32 size;
+    UINT32 size_be;
+}ventoy_iso9660_override;
+
 #pragma pack()
 
 
@@ -282,11 +288,9 @@ typedef struct ventoy_system_wrapper
     bs->func = wrapper.New##func;\
 }
 
-extern ventoy_efi_file_replace g_efi_file_replace;
 extern BOOLEAN gDebugPrint;
 VOID EFIAPI VtoyDebug(IN CONST CHAR8  *Format, ...);
 EFI_STATUS EFIAPI ventoy_wrapper_system(VOID);
-EFI_STATUS EFIAPI ventoy_wrapper_file_procotol(EFI_FILE_PROTOCOL *File);
 EFI_STATUS EFIAPI ventoy_block_io_read 
 (
     IN EFI_BLOCK_IO_PROTOCOL          *This,
@@ -296,5 +300,33 @@ EFI_STATUS EFIAPI ventoy_block_io_read
     OUT VOID                          *Buffer
 );
 
+
+extern ventoy_chain_head *g_chain;
+extern ventoy_img_chunk *g_chunk;
+extern UINT32 g_img_chunk_num;
+extern ventoy_override_chunk *g_override_chunk;
+extern UINT32 g_override_chunk_num;
+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_sector_flag *g_sector_flag;
+extern UINT32 g_sector_flag_num;
+extern BOOLEAN gMemdiskMode;
+extern UINTN g_iso_buf_size;
+extern ventoy_grub_param_file_replace *g_file_replace_list;
+extern BOOLEAN g_fixup_iso9660_secover_enable;
+extern EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *g_con_simple_input_ex;
+
+EFI_STATUS EFIAPI ventoy_wrapper_open_volume
+(
+    IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL     *This,
+    OUT EFI_FILE_PROTOCOL                 **Root
+);
+EFI_STATUS EFIAPI ventoy_install_blockio(IN EFI_HANDLE ImageHandle, IN UINT64 ImgSize);
+EFI_STATUS EFIAPI ventoy_wrapper_push_openvolume(IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME OpenVolume);
+EFI_STATUS ventoy_hook_keyboard_start(VOID);
+EFI_STATUS ventoy_hook_keyboard_stop(VOID);
+
 #endif
 

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

@@ -29,6 +29,7 @@
   Ventoy.h
   Ventoy.c
   VentoyDebug.c
+  VentoyProtocol.c
 
 [Packages]
   MdePkg/MdePkg.dec

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

@@ -36,6 +36,10 @@
 #include <Protocol/SimpleFileSystem.h>
 #include <Ventoy.h>
 
+#define PROCOTOL_SLEEP_SECONDS  0
+
+#define debug_sleep() if (PROCOTOL_SLEEP_SECONDS) sleep(PROCOTOL_SLEEP_SECONDS)
+
 STATIC ventoy_system_wrapper g_system_wrapper;
 
 static struct well_known_guid g_efi_well_known_guids[] = 
@@ -84,183 +88,6 @@ static const char * ventoy_get_guid_name(EFI_GUID *guid)
     return gEfiGuidName;
 }
 
-EFI_STATUS EFIAPI
-ventoy_wrapper_fs_open(EFI_FILE_HANDLE This, EFI_FILE_HANDLE *New, CHAR16 *Name, UINT64 Mode, UINT64 Attributes)
-{
-    (VOID)This;
-    (VOID)New;
-    (VOID)Name;
-    (VOID)Mode;
-    (VOID)Attributes;
-    return EFI_SUCCESS;
-}
-
-EFI_STATUS EFIAPI
-ventoy_wrapper_file_open_ex(EFI_FILE_HANDLE This, EFI_FILE_HANDLE *New, CHAR16 *Name, UINT64 Mode, UINT64 Attributes, EFI_FILE_IO_TOKEN *Token)
-{
-	return ventoy_wrapper_fs_open(This, New, Name, Mode, Attributes);
-}
-
-EFI_STATUS EFIAPI
-ventoy_wrapper_file_delete(EFI_FILE_HANDLE This)
-{
-    (VOID)This;
-	return EFI_SUCCESS;
-}
-
-EFI_STATUS EFIAPI
-ventoy_wrapper_file_set_info(EFI_FILE_HANDLE This, EFI_GUID *Type, UINTN Len, VOID *Data)
-{
-	return EFI_SUCCESS;
-}
-
-EFI_STATUS EFIAPI
-ventoy_wrapper_file_flush(EFI_FILE_HANDLE This)
-{
-    (VOID)This;
-	return EFI_SUCCESS;
-}
-
-/* Ex version */
-EFI_STATUS EFIAPI
-ventoy_wrapper_file_flush_ex(EFI_FILE_HANDLE This, EFI_FILE_IO_TOKEN *Token)
-{
-    (VOID)This;
-    (VOID)Token;
-	return EFI_SUCCESS;
-}
-
-
-EFI_STATUS EFIAPI
-ventoy_wrapper_file_write(EFI_FILE_HANDLE This, UINTN *Len, VOID *Data)
-{
-    (VOID)This;
-    (VOID)Len;
-    (VOID)Data;
-
-	return EFI_WRITE_PROTECTED;
-}
-
-EFI_STATUS EFIAPI
-ventoy_wrapper_file_write_ex(IN EFI_FILE_PROTOCOL *This, IN OUT EFI_FILE_IO_TOKEN *Token)
-{
-	return ventoy_wrapper_file_write(This, &(Token->BufferSize), Token->Buffer);
-}
-
-
-static EFI_STATUS EFIAPI
-ventoy_wrapper_file_close(EFI_FILE_HANDLE This)
-{
-    (VOID)This;
-    return EFI_SUCCESS;
-}
-
-
-static EFI_STATUS EFIAPI
-ventoy_wrapper_file_set_pos(EFI_FILE_HANDLE This, UINT64 Position)
-{
-    (VOID)This;
-    
-    g_efi_file_replace.CurPos = Position;
-    return EFI_SUCCESS;
-}
-
-static EFI_STATUS EFIAPI
-ventoy_wrapper_file_get_pos(EFI_FILE_HANDLE This, UINT64 *Position)
-{
-    (VOID)This;
-
-    *Position = g_efi_file_replace.CurPos;
-
-    return EFI_SUCCESS;
-}
-
-
-static EFI_STATUS EFIAPI
-ventoy_wrapper_file_get_info(EFI_FILE_HANDLE This, EFI_GUID *Type, UINTN *Len, VOID *Data)
-{
-    EFI_FILE_INFO *Info = (EFI_FILE_INFO *) Data;
-
-    debug("ventoy_wrapper_file_get_info ... %u", *Len);
-
-    if (!CompareGuid(Type, &gEfiFileInfoGuid))
-    {
-        return EFI_INVALID_PARAMETER;
-    }
-
-    if (*Len == 0)
-    {
-        *Len = 384;
-        return EFI_BUFFER_TOO_SMALL;
-    }
-
-    ZeroMem(Data, sizeof(EFI_FILE_INFO));
-
-    Info->Size = sizeof(EFI_FILE_INFO);
-    Info->FileSize = g_efi_file_replace.FileSizeBytes;
-    Info->PhysicalSize = g_efi_file_replace.FileSizeBytes;
-    Info->Attribute = EFI_FILE_READ_ONLY;
-    //Info->FileName = EFI_FILE_READ_ONLY;
-
-    *Len = Info->Size;
-    
-    return EFI_SUCCESS;
-}
-
-static EFI_STATUS EFIAPI
-ventoy_wrapper_file_read(EFI_FILE_HANDLE This, UINTN *Len, VOID *Data)
-{
-    EFI_LBA Lba;
-    UINTN ReadLen = *Len;
-    
-    (VOID)This;
-
-    debug("ventoy_wrapper_file_read ... %u", *Len);
-
-    if (g_efi_file_replace.CurPos + ReadLen > g_efi_file_replace.FileSizeBytes)
-    {
-        ReadLen = g_efi_file_replace.FileSizeBytes - g_efi_file_replace.CurPos;
-    }
-
-    Lba = g_efi_file_replace.CurPos / 2048 + g_efi_file_replace.BlockIoSectorStart;
-
-    ventoy_block_io_read(NULL, 0, Lba, ReadLen, Data);
-
-    *Len = ReadLen;
-
-    g_efi_file_replace.CurPos += ReadLen;
-
-    return EFI_SUCCESS;
-}
-
-
-EFI_STATUS EFIAPI
-ventoy_wrapper_file_read_ex(IN EFI_FILE_PROTOCOL *This, IN OUT EFI_FILE_IO_TOKEN *Token)
-{
-	return ventoy_wrapper_file_read(This, &(Token->BufferSize), Token->Buffer);
-}
-
-EFI_STATUS EFIAPI ventoy_wrapper_file_procotol(EFI_FILE_PROTOCOL *File)
-{
-    File->Revision    = EFI_FILE_PROTOCOL_REVISION2;
-    File->Open        = ventoy_wrapper_fs_open;
-    File->Close       = ventoy_wrapper_file_close;
-    File->Delete      = ventoy_wrapper_file_delete;
-    File->Read        = ventoy_wrapper_file_read;
-    File->Write       = ventoy_wrapper_file_write;
-    File->GetPosition = ventoy_wrapper_file_get_pos;
-    File->SetPosition = ventoy_wrapper_file_set_pos;
-    File->GetInfo     = ventoy_wrapper_file_get_info;
-    File->SetInfo     = ventoy_wrapper_file_set_info;
-    File->Flush       = ventoy_wrapper_file_flush;
-    File->OpenEx      = ventoy_wrapper_file_open_ex;
-    File->ReadEx      = ventoy_wrapper_file_read_ex;
-    File->WriteEx     = ventoy_wrapper_file_write_ex;
-    File->FlushEx     = ventoy_wrapper_file_flush_ex;
-
-    return EFI_SUCCESS;
-}
-
 STATIC EFI_STATUS EFIAPI ventoy_handle_protocol
 (
     IN  EFI_HANDLE                Handle,
@@ -270,7 +97,7 @@ STATIC EFI_STATUS EFIAPI ventoy_handle_protocol
 {
     EFI_STATUS Status = EFI_SUCCESS;
     
-    debug("ventoy_handle_protocol:%a", ventoy_get_guid_name(Protocol)); 
+    debug("ventoy_handle_protocol:%a", ventoy_get_guid_name(Protocol)); debug_sleep();
     Status = g_system_wrapper.OriHandleProtocol(Handle, Protocol, Interface);
 
     if (CompareGuid(Protocol, &gEfiSimpleFileSystemProtocolGuid))
@@ -280,7 +107,7 @@ STATIC EFI_STATUS EFIAPI ventoy_handle_protocol
         
         pFile->OpenVolume(pFile, &FileProtocol);
         
-        debug("Handle FS Protocol: %p OpenVolume:%p, FileProtocol:%p, Open:%p", 
+        trace("Handle FS Protocol: %p OpenVolume:%p, FileProtocol:%p, Open:%p", 
             pFile, pFile->OpenVolume, FileProtocol, FileProtocol->Open); 
 
         sleep(3);
@@ -299,7 +126,7 @@ STATIC EFI_STATUS EFIAPI ventoy_open_protocol
     IN  UINT32                     Attributes
 )
 {
-    debug("ventoy_open_protocol:%a", ventoy_get_guid_name(Protocol));
+    debug("ventoy_open_protocol:%a", ventoy_get_guid_name(Protocol));  debug_sleep();
     return g_system_wrapper.OriOpenProtocol(Handle, Protocol, Interface, AgentHandle, ControllerHandle, Attributes);
 }
 
@@ -310,7 +137,7 @@ STATIC EFI_STATUS EFIAPI ventoy_locate_protocol
     OUT VOID      **Interface
 )
 {
-    debug("ventoy_locate_protocol:%a", ventoy_get_guid_name(Protocol));
+    debug("ventoy_locate_protocol:%a", ventoy_get_guid_name(Protocol));  debug_sleep();
     return g_system_wrapper.OriLocateProtocol(Protocol, Registration, Interface);
 }
 
@@ -318,7 +145,7 @@ EFI_STATUS EFIAPI ventoy_wrapper_system(VOID)
 {
     ventoy_wrapper(gBS, g_system_wrapper, LocateProtocol, ventoy_locate_protocol);
     ventoy_wrapper(gBS, g_system_wrapper, HandleProtocol, ventoy_handle_protocol);
-    ventoy_wrapper(gBS, g_system_wrapper, OpenProtocol,    ventoy_open_protocol);
+    ventoy_wrapper(gBS, g_system_wrapper, OpenProtocol,   ventoy_open_protocol);
 
     return EFI_SUCCESS;
 }

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

@@ -0,0 +1,918 @@
+/******************************************************************************
+ * Ventoy.c
+ *
+ * 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/>.
+ *
+ */
+
+#include <Uefi.h>
+#include <Library/DebugLib.h>
+#include <Library/PrintLib.h>
+#include <Library/UefiLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/DevicePathLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiRuntimeServicesTableLib.h>
+#include <Library/UefiApplicationEntryPoint.h>
+#include <Protocol/LoadedImage.h>
+#include <Guid/FileInfo.h>
+#include <Guid/FileSystemInfo.h>
+#include <Protocol/BlockIo.h>
+#include <Protocol/RamDisk.h>
+#include <Protocol/SimpleFileSystem.h>
+#include <Ventoy.h>
+
+UINTN g_iso_buf_size = 0;
+BOOLEAN gMemdiskMode = FALSE;
+
+ventoy_sector_flag *g_sector_flag = NULL;
+UINT32 g_sector_flag_num = 0;
+
+EFI_FILE_OPEN g_original_fopen = NULL;
+EFI_FILE_CLOSE g_original_fclose = NULL;
+EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME g_original_open_volume = NULL;
+
+/* EFI block device vendor device path GUID */
+EFI_GUID gVtoyBlockDevicePathGuid = VTOY_BLOCK_DEVICE_PATH_GUID;
+
+#define VENTOY_ISO9660_SECTOR_OVERFLOW  2097152
+
+BOOLEAN g_fixup_iso9660_secover_enable = FALSE;
+BOOLEAN g_fixup_iso9660_secover_start  = FALSE;
+UINT64  g_fixup_iso9660_secover_1st_secs = 0;
+UINT64  g_fixup_iso9660_secover_cur_secs = 0;
+UINT64  g_fixup_iso9660_secover_tot_secs = 0;
+
+STATIC UINTN g_keyboard_hook_count = 0;
+STATIC BOOLEAN g_blockio_start_record_bcd = FALSE;
+STATIC BOOLEAN g_blockio_bcd_read_done = FALSE;
+
+EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *g_con_simple_input_ex = NULL;
+STATIC EFI_INPUT_READ_KEY_EX g_org_read_key_ex = NULL;
+STATIC EFI_INPUT_READ_KEY g_org_read_key = NULL;
+
+#if 0
+/* Block IO procotol */
+#endif
+
+EFI_STATUS EFIAPI ventoy_block_io_reset 
+(
+    IN EFI_BLOCK_IO_PROTOCOL          *This,
+    IN BOOLEAN                        ExtendedVerification
+) 
+{
+    (VOID)This;
+    (VOID)ExtendedVerification;
+	return EFI_SUCCESS;
+}
+
+STATIC EFI_STATUS EFIAPI ventoy_read_iso_sector
+(
+    IN UINT64                 Sector,
+    IN UINTN                  Count,
+    OUT VOID                 *Buffer
+)
+{
+    EFI_STATUS Status = EFI_SUCCESS;
+    EFI_LBA MapLba = 0;
+    UINT32 i = 0;
+    UINTN secLeft = 0;
+    UINTN secRead = 0;
+    UINT64 ReadStart = 0;
+    UINT64 ReadEnd = 0;
+    UINT64 OverrideStart = 0;
+    UINT64 OverrideEnd= 0;
+    UINT8 *pCurBuf = (UINT8 *)Buffer;
+    ventoy_img_chunk *pchunk = g_chunk;
+    ventoy_override_chunk *pOverride = g_override_chunk;
+    EFI_BLOCK_IO_PROTOCOL *pRawBlockIo = gBlockData.pRawBlockIo;
+    
+    debug("read iso sector %lu  count %u", Sector, Count);
+
+    ReadStart = Sector * 2048;
+    ReadEnd = (Sector + Count) * 2048;
+
+    for (i = 0; Count > 0 && i < g_img_chunk_num; i++, pchunk++)
+    {
+        if (Sector >= pchunk->img_start_sector && Sector <= pchunk->img_end_sector)
+        {
+            if (g_chain->disk_sector_size == 512)
+            {
+                MapLba = (Sector - pchunk->img_start_sector) * 4 + pchunk->disk_start_sector;
+            }
+            else
+            {
+                MapLba = (Sector - pchunk->img_start_sector) * 2048 / g_chain->disk_sector_size + pchunk->disk_start_sector;
+            }
+
+            secLeft = pchunk->img_end_sector + 1 - Sector;
+            secRead = (Count < secLeft) ? Count : secLeft;
+
+            Status = pRawBlockIo->ReadBlocks(pRawBlockIo, pRawBlockIo->Media->MediaId,
+                                     MapLba, secRead * 2048, pCurBuf);
+            if (EFI_ERROR(Status))
+            {
+                debug("Raw disk read block failed %r", Status);
+                return Status;
+            }
+
+            Count -= secRead;
+            Sector += secRead;
+            pCurBuf += secRead * 2048;
+        }
+    }
+
+    if (ReadStart > g_chain->real_img_size_in_bytes)
+    {
+        return EFI_SUCCESS;
+    }
+
+    /* override data */
+    pCurBuf = (UINT8 *)Buffer;
+    for (i = 0; i < g_override_chunk_num; i++, pOverride++)
+    {
+        OverrideStart = pOverride->img_offset;
+        OverrideEnd = pOverride->img_offset + pOverride->override_size;
+    
+        if (OverrideStart >= ReadEnd || ReadStart >= OverrideEnd)
+        {
+            continue;
+        }
+
+        if (ReadStart <= OverrideStart)
+        {
+            if (ReadEnd <= OverrideEnd)
+            {
+                CopyMem(pCurBuf + OverrideStart - ReadStart, pOverride->override_data, ReadEnd - OverrideStart);  
+            }
+            else
+            {
+                CopyMem(pCurBuf + OverrideStart - ReadStart, pOverride->override_data, pOverride->override_size);
+            }
+        }
+        else
+        {
+            if (ReadEnd <= OverrideEnd)
+            {
+                CopyMem(pCurBuf, pOverride->override_data + ReadStart - OverrideStart, ReadEnd - ReadStart); 
+            }
+            else
+            {
+                CopyMem(pCurBuf, pOverride->override_data + ReadStart - OverrideStart, OverrideEnd - ReadStart);
+            }
+        }
+
+        if (g_fixup_iso9660_secover_enable && (!g_fixup_iso9660_secover_start) && 
+            pOverride->override_size == sizeof(ventoy_iso9660_override))
+        {
+            ventoy_iso9660_override *dirent = (ventoy_iso9660_override *)pOverride->override_data;
+            if (dirent->first_sector >= VENTOY_ISO9660_SECTOR_OVERFLOW)
+            {
+                g_fixup_iso9660_secover_start = TRUE;
+                g_fixup_iso9660_secover_cur_secs = 0;
+            }
+        }
+    }
+
+    if (g_blockio_start_record_bcd && FALSE == g_blockio_bcd_read_done)
+    {
+        if (*(UINT32 *)Buffer == 0x66676572)
+        {
+            g_blockio_bcd_read_done = TRUE;
+        }
+    }
+
+    return EFI_SUCCESS;    
+}
+
+EFI_STATUS EFIAPI ventoy_block_io_ramdisk_read 
+(
+    IN EFI_BLOCK_IO_PROTOCOL          *This,
+    IN UINT32                          MediaId,
+    IN EFI_LBA                         Lba,
+    IN UINTN                           BufferSize,
+    OUT VOID                          *Buffer
+) 
+{
+    //debug("### ventoy_block_io_ramdisk_read sector:%u count:%u", (UINT32)Lba, (UINT32)BufferSize / 2048);
+
+    (VOID)This;
+    (VOID)MediaId;
+
+    CopyMem(Buffer, (char *)g_chain + (Lba * 2048), BufferSize);
+    
+    if (g_blockio_start_record_bcd && FALSE == g_blockio_bcd_read_done)
+    {
+        if (*(UINT32 *)Buffer == 0x66676572)
+        {
+            g_blockio_bcd_read_done = TRUE;            
+        }
+    }
+
+	return EFI_SUCCESS;
+}
+
+EFI_LBA EFIAPI ventoy_fixup_iso9660_sector(IN EFI_LBA Lba, UINT32 secNum)
+{
+    UINT32 i = 0;
+
+    if (g_fixup_iso9660_secover_cur_secs > 0)
+    {
+        Lba += VENTOY_ISO9660_SECTOR_OVERFLOW;
+        g_fixup_iso9660_secover_cur_secs += secNum;
+        if (g_fixup_iso9660_secover_cur_secs >= g_fixup_iso9660_secover_tot_secs)
+        {
+            g_fixup_iso9660_secover_start = FALSE;
+            goto end;
+        }
+    }
+    else
+    {
+        ventoy_iso9660_override *dirent;
+        ventoy_override_chunk *pOverride;
+
+        for (i = 0, pOverride = g_override_chunk; i < g_override_chunk_num; i++, pOverride++)
+        {
+            dirent = (ventoy_iso9660_override *)pOverride->override_data;
+            if (Lba == dirent->first_sector)
+            {
+                g_fixup_iso9660_secover_start = FALSE;
+                goto end;
+            }
+        }
+
+        if (g_fixup_iso9660_secover_start)
+        {
+            for (i = 0, pOverride = g_override_chunk; i < g_override_chunk_num; i++, pOverride++)
+            {
+                dirent = (ventoy_iso9660_override *)pOverride->override_data;
+                if (Lba + VENTOY_ISO9660_SECTOR_OVERFLOW == dirent->first_sector)
+                {
+                    g_fixup_iso9660_secover_tot_secs = (dirent->size + 2047) / 2048;
+                    g_fixup_iso9660_secover_cur_secs = secNum;
+                    if (g_fixup_iso9660_secover_cur_secs >= g_fixup_iso9660_secover_tot_secs)
+                    {
+                        g_fixup_iso9660_secover_start = FALSE;
+                    }
+                    Lba += VENTOY_ISO9660_SECTOR_OVERFLOW;
+                    goto end;
+                }
+            }
+        }
+    }
+
+end:
+    return Lba;
+}
+
+EFI_STATUS EFIAPI ventoy_block_io_read 
+(
+    IN EFI_BLOCK_IO_PROTOCOL          *This,
+    IN UINT32                          MediaId,
+    IN EFI_LBA                         Lba,
+    IN UINTN                           BufferSize,
+    OUT VOID                          *Buffer
+) 
+{
+    UINT32 i = 0;
+    UINT32 j = 0;
+    UINT32 lbacount = 0;
+    UINT32 secNum = 0;
+    UINT64 offset = 0;
+    EFI_LBA curlba = 0;
+    EFI_LBA lastlba = 0;
+    UINT8 *lastbuffer;
+    ventoy_sector_flag *cur_flag;
+    ventoy_virt_chunk *node;
+    
+    //debug("### ventoy_block_io_read sector:%u count:%u", (UINT32)Lba, (UINT32)BufferSize / 2048);
+
+    secNum = BufferSize / 2048;
+
+    /* Workaround for SSTR PE loader error */
+    if (g_fixup_iso9660_secover_start)
+    {
+        Lba = ventoy_fixup_iso9660_sector(Lba, secNum);
+    }
+
+    offset = Lba * 2048;
+
+    if (offset + BufferSize <= g_chain->real_img_size_in_bytes)
+    {
+        return ventoy_read_iso_sector(Lba, secNum, Buffer);
+    }
+
+    if (secNum > g_sector_flag_num)
+    {
+        cur_flag = AllocatePool(secNum * sizeof(ventoy_sector_flag));
+        if (NULL == cur_flag)
+        {
+            return EFI_OUT_OF_RESOURCES;
+        }
+
+        FreePool(g_sector_flag);
+        g_sector_flag = cur_flag;
+        g_sector_flag_num = secNum;
+    }
+
+    for (curlba = Lba, cur_flag = g_sector_flag, j = 0; j < secNum; j++, curlba++, cur_flag++)
+    {
+        cur_flag->flag = 0;
+        for (node = g_virt_chunk, i = 0; i < g_virt_chunk_num; i++, node++)
+        {
+            if (curlba >= node->mem_sector_start && curlba < node->mem_sector_end)
+            {
+                CopyMem((UINT8 *)Buffer + j * 2048, 
+                       (char *)g_virt_chunk + node->mem_sector_offset + (curlba - node->mem_sector_start) * 2048,
+                       2048);
+                cur_flag->flag = 1;
+                break;
+            }
+            else if (curlba >= node->remap_sector_start && curlba < node->remap_sector_end)
+            {
+                cur_flag->remap_lba = node->org_sector_start + curlba - node->remap_sector_start;
+                cur_flag->flag = 2;
+                break;
+            }
+        }
+    }
+
+    for (curlba = Lba, cur_flag = g_sector_flag, j = 0; j < secNum; j++, curlba++, cur_flag++)
+    {
+        if (cur_flag->flag == 2)
+        {
+            if (lastlba == 0)
+            {
+                lastbuffer = (UINT8 *)Buffer + j * 2048;
+                lastlba = cur_flag->remap_lba;
+                lbacount = 1;
+            }
+            else if (lastlba + lbacount == cur_flag->remap_lba)
+            {
+                lbacount++;
+            }
+            else
+            {
+                ventoy_read_iso_sector(lastlba, lbacount, lastbuffer);
+                lastbuffer = (UINT8 *)Buffer + j * 2048;
+                lastlba = cur_flag->remap_lba;
+                lbacount = 1;
+            }
+        }
+    }
+
+    if (lbacount > 0)
+    {
+        ventoy_read_iso_sector(lastlba, lbacount, lastbuffer);
+    }
+
+	return EFI_SUCCESS;
+}
+
+EFI_STATUS EFIAPI ventoy_block_io_write 
+(
+    IN EFI_BLOCK_IO_PROTOCOL          *This,
+    IN UINT32                          MediaId,
+    IN EFI_LBA                         Lba,
+    IN UINTN                           BufferSize,
+    IN VOID                           *Buffer
+) 
+{
+    (VOID)This;
+    (VOID)MediaId;
+    (VOID)Lba;
+    (VOID)BufferSize;
+    (VOID)Buffer;
+	return EFI_WRITE_PROTECTED;
+}
+
+EFI_STATUS EFIAPI ventoy_block_io_flush(IN EFI_BLOCK_IO_PROTOCOL *This)
+{
+	(VOID)This;
+	return EFI_SUCCESS;
+}
+
+
+EFI_STATUS EFIAPI ventoy_fill_device_path(VOID)
+{
+    UINTN NameLen = 0;
+    UINT8 TmpBuf[128] = {0};
+    VENDOR_DEVICE_PATH *venPath = NULL;
+
+    venPath = (VENDOR_DEVICE_PATH *)TmpBuf;
+    NameLen = StrSize(VTOY_BLOCK_DEVICE_PATH_NAME);
+    venPath->Header.Type = HARDWARE_DEVICE_PATH;
+    venPath->Header.SubType = HW_VENDOR_DP;
+    venPath->Header.Length[0] = sizeof(VENDOR_DEVICE_PATH) + NameLen;
+    venPath->Header.Length[1] = 0;
+    CopyMem(&venPath->Guid, &gVtoyBlockDevicePathGuid, sizeof(EFI_GUID));
+    CopyMem(venPath + 1, VTOY_BLOCK_DEVICE_PATH_NAME, NameLen);
+    
+    gBlockData.Path = AppendDevicePathNode(NULL, (EFI_DEVICE_PATH_PROTOCOL *)TmpBuf);
+    gBlockData.DevicePathCompareLen = sizeof(VENDOR_DEVICE_PATH) + NameLen;
+
+    debug("gBlockData.Path=<%s>\n", ConvertDevicePathToText(gBlockData.Path, FALSE, FALSE));
+
+    return EFI_SUCCESS;
+}
+
+EFI_STATUS EFIAPI ventoy_connect_driver(IN EFI_HANDLE ControllerHandle, IN CONST CHAR16 *DrvName)
+{
+    UINTN i = 0;
+    UINTN Count = 0;
+    CHAR16 *DriverName = NULL;
+    EFI_HANDLE *Handles = NULL;
+    EFI_HANDLE DrvHandles[2] = { NULL };
+    EFI_STATUS Status = EFI_SUCCESS;
+    EFI_COMPONENT_NAME_PROTOCOL *NameProtocol = NULL;
+    EFI_COMPONENT_NAME2_PROTOCOL *Name2Protocol = NULL;
+
+    debug("ventoy_connect_driver <%s>...", DrvName);
+
+    Status = gBS->LocateHandleBuffer(ByProtocol, &gEfiComponentName2ProtocolGuid, 
+                                     NULL, &Count, &Handles);
+    if (EFI_ERROR(Status))
+    {
+        return Status;
+    }
+
+    for (i = 0; i < Count; i++)
+    {
+        Status = gBS->HandleProtocol(Handles[i], &gEfiComponentName2ProtocolGuid, (VOID **)&Name2Protocol);
+        if (EFI_ERROR(Status))
+        {
+            continue;
+        }
+
+        Status = Name2Protocol->GetDriverName(Name2Protocol, "en", &DriverName);
+        if (EFI_ERROR(Status) || NULL == DriverName)
+        {
+            continue;
+        }
+
+        if (StrStr(DriverName, DrvName))
+        {
+            debug("Find driver name2:<%s>: <%s>", DriverName, DrvName);
+            DrvHandles[0] = Handles[i];
+            break;
+        }
+    }
+
+    if (i < Count)
+    {
+        Status = gBS->ConnectController(ControllerHandle, DrvHandles, NULL, TRUE);
+        debug("Connect partition driver:<%r>", Status);
+        goto end;
+    }
+
+    debug("%s NOT found, now try COMPONENT_NAME", DrvName);
+
+    Count = 0;
+    FreePool(Handles);
+    Handles = NULL;
+
+    Status = gBS->LocateHandleBuffer(ByProtocol, &gEfiComponentNameProtocolGuid, 
+                                     NULL, &Count, &Handles);
+    if (EFI_ERROR(Status))
+    {
+        return Status;
+    }
+
+    for (i = 0; i < Count; i++)
+    {
+        Status = gBS->HandleProtocol(Handles[i], &gEfiComponentNameProtocolGuid, (VOID **)&NameProtocol);
+        if (EFI_ERROR(Status))
+        {
+            continue;
+        }
+
+        Status = NameProtocol->GetDriverName(NameProtocol, "en", &DriverName);
+        if (EFI_ERROR(Status))
+        {
+            continue;
+        }
+
+        if (StrStr(DriverName, DrvName))
+        {
+            debug("Find driver name:<%s>: <%s>", DriverName, DrvName);
+            DrvHandles[0] = Handles[i];
+            break;
+        }
+    }
+
+    if (i < Count)
+    {
+        Status = gBS->ConnectController(ControllerHandle, DrvHandles, NULL, TRUE);
+        debug("Connect partition driver:<%r>", Status);
+        goto end;
+    }
+
+    Status = EFI_NOT_FOUND;
+    
+end:
+    FreePool(Handles);
+    
+    return Status;
+}
+
+EFI_STATUS EFIAPI ventoy_install_blockio(IN EFI_HANDLE ImageHandle, IN UINT64 ImgSize)
+{   
+    EFI_STATUS Status = EFI_SUCCESS;
+    EFI_BLOCK_IO_PROTOCOL *pBlockIo = &(gBlockData.BlockIo);
+    
+    ventoy_fill_device_path();
+    
+    gBlockData.Media.BlockSize = 2048;
+    gBlockData.Media.LastBlock = ImgSize / 2048 - 1;
+    gBlockData.Media.ReadOnly = TRUE;
+    gBlockData.Media.MediaPresent = 1;
+    gBlockData.Media.LogicalBlocksPerPhysicalBlock = 1;
+
+	pBlockIo->Revision = EFI_BLOCK_IO_PROTOCOL_REVISION3;
+	pBlockIo->Media = &(gBlockData.Media);
+	pBlockIo->Reset = ventoy_block_io_reset;
+    pBlockIo->ReadBlocks = gMemdiskMode ? ventoy_block_io_ramdisk_read : ventoy_block_io_read;
+	pBlockIo->WriteBlocks = ventoy_block_io_write;
+	pBlockIo->FlushBlocks = ventoy_block_io_flush;
+
+    Status = gBS->InstallMultipleProtocolInterfaces(&gBlockData.Handle,
+            &gEfiBlockIoProtocolGuid, &gBlockData.BlockIo,
+            &gEfiDevicePathProtocolGuid, gBlockData.Path,
+            NULL);
+    debug("Install protocol %r %p", Status, gBlockData.Handle);
+    if (EFI_ERROR(Status))
+    {
+        return Status;
+    }
+    
+    Status = ventoy_connect_driver(gBlockData.Handle, L"Disk I/O Driver");
+    debug("Connect disk IO driver %r", Status);
+    ventoy_debug_pause();
+    
+    Status = ventoy_connect_driver(gBlockData.Handle, L"Partition Driver");
+    debug("Connect partition driver %r", Status);
+    if (EFI_ERROR(Status))
+    {
+        Status = gBS->ConnectController(gBlockData.Handle, NULL, NULL, TRUE);
+        debug("Connect all controller %r", Status);
+    }
+
+    ventoy_debug_pause();
+
+    return EFI_SUCCESS;
+}
+
+#if 0
+/* For file replace */
+#endif
+
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_fs_open(EFI_FILE_HANDLE This, EFI_FILE_HANDLE *New, CHAR16 *Name, UINT64 Mode, UINT64 Attributes)
+{
+    (VOID)This;
+    (VOID)New;
+    (VOID)Name;
+    (VOID)Mode;
+    (VOID)Attributes;
+    return EFI_SUCCESS;
+}
+
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_open_ex(EFI_FILE_HANDLE This, EFI_FILE_HANDLE *New, CHAR16 *Name, UINT64 Mode, UINT64 Attributes, EFI_FILE_IO_TOKEN *Token)
+{
+	return ventoy_wrapper_fs_open(This, New, Name, Mode, Attributes);
+}
+
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_delete(EFI_FILE_HANDLE This)
+{
+    (VOID)This;
+	return EFI_SUCCESS;
+}
+
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_set_info(EFI_FILE_HANDLE This, EFI_GUID *Type, UINTN Len, VOID *Data)
+{
+	return EFI_SUCCESS;
+}
+
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_flush(EFI_FILE_HANDLE This)
+{
+    (VOID)This;
+	return EFI_SUCCESS;
+}
+
+/* Ex version */
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_flush_ex(EFI_FILE_HANDLE This, EFI_FILE_IO_TOKEN *Token)
+{
+    (VOID)This;
+    (VOID)Token;
+	return EFI_SUCCESS;
+}
+
+
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_write(EFI_FILE_HANDLE This, UINTN *Len, VOID *Data)
+{
+    (VOID)This;
+    (VOID)Len;
+    (VOID)Data;
+
+	return EFI_WRITE_PROTECTED;
+}
+
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_write_ex(IN EFI_FILE_PROTOCOL *This, IN OUT EFI_FILE_IO_TOKEN *Token)
+{
+	return ventoy_wrapper_file_write(This, &(Token->BufferSize), Token->Buffer);
+}
+
+
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_close(EFI_FILE_HANDLE This)
+{
+    (VOID)This;
+    return EFI_SUCCESS;
+}
+
+
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_set_pos(EFI_FILE_HANDLE This, UINT64 Position)
+{
+    (VOID)This;
+    
+    g_efi_file_replace.CurPos = Position;
+    return EFI_SUCCESS;
+}
+
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_get_pos(EFI_FILE_HANDLE This, UINT64 *Position)
+{
+    (VOID)This;
+
+    *Position = g_efi_file_replace.CurPos;
+
+    return EFI_SUCCESS;
+}
+
+
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_get_info(EFI_FILE_HANDLE This, EFI_GUID *Type, UINTN *Len, VOID *Data)
+{
+    EFI_FILE_INFO *Info = (EFI_FILE_INFO *) Data;
+
+    debug("ventoy_wrapper_file_get_info ... %u", *Len);
+
+    if (!CompareGuid(Type, &gEfiFileInfoGuid))
+    {
+        return EFI_INVALID_PARAMETER;
+    }
+
+    if (*Len == 0)
+    {
+        *Len = 384;
+        return EFI_BUFFER_TOO_SMALL;
+    }
+
+    ZeroMem(Data, sizeof(EFI_FILE_INFO));
+
+    Info->Size = sizeof(EFI_FILE_INFO);
+    Info->FileSize = g_efi_file_replace.FileSizeBytes;
+    Info->PhysicalSize = g_efi_file_replace.FileSizeBytes;
+    Info->Attribute = EFI_FILE_READ_ONLY;
+    //Info->FileName = EFI_FILE_READ_ONLY;
+
+    *Len = Info->Size;
+    
+    return EFI_SUCCESS;
+}
+
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_read(EFI_FILE_HANDLE This, UINTN *Len, VOID *Data)
+{
+    EFI_LBA Lba;
+    UINTN ReadLen = *Len;
+    
+    (VOID)This;
+
+    debug("ventoy_wrapper_file_read ... %u", *Len);
+
+    if (g_efi_file_replace.CurPos + ReadLen > g_efi_file_replace.FileSizeBytes)
+    {
+        ReadLen = g_efi_file_replace.FileSizeBytes - g_efi_file_replace.CurPos;
+    }
+
+    Lba = g_efi_file_replace.CurPos / 2048 + g_efi_file_replace.BlockIoSectorStart;
+
+    ventoy_block_io_read(NULL, 0, Lba, ReadLen, Data);
+
+    *Len = ReadLen;
+
+    g_efi_file_replace.CurPos += ReadLen;
+
+    return EFI_SUCCESS;
+}
+
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_read_ex(IN EFI_FILE_PROTOCOL *This, IN OUT EFI_FILE_IO_TOKEN *Token)
+{
+	return ventoy_wrapper_file_read(This, &(Token->BufferSize), Token->Buffer);
+}
+
+STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_procotol(EFI_FILE_PROTOCOL *File)
+{
+    File->Revision    = EFI_FILE_PROTOCOL_REVISION2;
+    File->Open        = ventoy_wrapper_fs_open;
+    File->Close       = ventoy_wrapper_file_close;
+    File->Delete      = ventoy_wrapper_file_delete;
+    File->Read        = ventoy_wrapper_file_read;
+    File->Write       = ventoy_wrapper_file_write;
+    File->GetPosition = ventoy_wrapper_file_get_pos;
+    File->SetPosition = ventoy_wrapper_file_set_pos;
+    File->GetInfo     = ventoy_wrapper_file_get_info;
+    File->SetInfo     = ventoy_wrapper_file_set_info;
+    File->Flush       = ventoy_wrapper_file_flush;
+    File->OpenEx      = ventoy_wrapper_file_open_ex;
+    File->ReadEx      = ventoy_wrapper_file_read_ex;
+    File->WriteEx     = ventoy_wrapper_file_write_ex;
+    File->FlushEx     = ventoy_wrapper_file_flush_ex;
+
+    return EFI_SUCCESS;
+}
+
+STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
+(
+    EFI_FILE_HANDLE This, 
+    EFI_FILE_HANDLE *New,
+    CHAR16 *Name, 
+    UINT64 Mode, 
+    UINT64 Attributes
+)
+{
+    UINT32 i = 0;
+    UINT32 j = 0;
+    UINT64 Sectors = 0;
+    EFI_STATUS Status = EFI_SUCCESS;
+    CHAR8 TmpName[256];
+    ventoy_virt_chunk *virt = NULL;
+
+    Status = g_original_fopen(This, New, Name, Mode, Attributes);
+    if (EFI_ERROR(Status))
+    {
+        return Status;
+    }
+
+    if (g_file_replace_list && g_file_replace_list->magic == GRUB_FILE_REPLACE_MAGIC &&
+        g_file_replace_list->new_file_virtual_id < g_virt_chunk_num)
+    {
+        AsciiSPrint(TmpName, sizeof(TmpName), "%s", Name);
+        for (j = 0; j < 4; j++)
+        {
+            if (0 == AsciiStrCmp(g_file_replace_list[i].old_file_name[j], TmpName))
+            {
+                g_original_fclose(*New);
+                *New = &g_efi_file_replace.WrapperHandle;
+                ventoy_wrapper_file_procotol(*New);
+
+                virt = g_virt_chunk + g_file_replace_list->new_file_virtual_id;
+
+                Sectors = (virt->mem_sector_end - virt->mem_sector_start) + (virt->remap_sector_end - virt->remap_sector_start);
+                
+                g_efi_file_replace.BlockIoSectorStart = virt->mem_sector_start;
+                g_efi_file_replace.FileSizeBytes = Sectors * 2048;
+
+                if (gDebugPrint)
+                {
+                    debug("## ventoy_wrapper_file_open <%s> BlockStart:%lu Sectors:%lu Bytes:%lu", Name,
+                        g_efi_file_replace.BlockIoSectorStart, Sectors, Sectors * 2048);
+                    sleep(3);
+                }
+                
+                return Status;
+            }
+        }
+    }
+
+    return Status;
+}
+
+EFI_STATUS EFIAPI ventoy_wrapper_open_volume
+(
+    IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL     *This,
+    OUT EFI_FILE_PROTOCOL                 **Root
+)
+{
+    EFI_STATUS Status = EFI_SUCCESS;
+    
+    Status = g_original_open_volume(This, Root);
+    if (!EFI_ERROR(Status))
+    {
+        g_original_fopen = (*Root)->Open;
+        g_original_fclose = (*Root)->Close;
+        (*Root)->Open = ventoy_wrapper_file_open;
+    }
+
+    return Status;
+}
+
+EFI_STATUS EFIAPI ventoy_wrapper_push_openvolume(IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME OpenVolume)
+{
+    g_original_open_volume = OpenVolume;
+    return EFI_SUCCESS;
+}
+
+#if 0
+/* For auto skip Windows 'Press any key to boot from CD or DVD ...' */
+#endif
+
+STATIC EFI_STATUS EFIAPI ventoy_wrapper_read_key_ex
+(
+    IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
+    OUT EFI_KEY_DATA                      *KeyData
+)
+{
+    /* only hook once before BCD file read */
+    if (g_keyboard_hook_count == 0 && g_blockio_bcd_read_done == FALSE)
+    {
+        g_keyboard_hook_count++;
+
+        KeyData->Key.ScanCode = SCAN_DELETE;
+        KeyData->Key.UnicodeChar = 0;
+        KeyData->KeyState.KeyShiftState = 0;
+        KeyData->KeyState.KeyToggleState = 0;
+        
+        return EFI_SUCCESS;
+    }
+    
+    return g_org_read_key_ex(This, KeyData);
+}
+
+EFI_STATUS EFIAPI ventoy_wrapper_read_key
+(
+    IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL       *This,
+    OUT EFI_INPUT_KEY                       *Key
+)
+{
+    /* only hook once before BCD file read */
+    if (g_keyboard_hook_count == 0 && g_blockio_bcd_read_done == FALSE)
+    {
+        g_keyboard_hook_count++;
+
+        Key->ScanCode = SCAN_DELETE;
+        Key->UnicodeChar = 0;
+        return EFI_SUCCESS;
+    }
+
+    return g_org_read_key(This, Key);
+}
+
+EFI_STATUS ventoy_hook_keyboard_start(VOID)
+{
+    g_blockio_start_record_bcd = TRUE;
+    g_blockio_bcd_read_done = FALSE;
+    g_keyboard_hook_count = 0;
+
+    if (g_con_simple_input_ex)
+    {
+        g_org_read_key_ex = g_con_simple_input_ex->ReadKeyStrokeEx;
+        g_con_simple_input_ex->ReadKeyStrokeEx = ventoy_wrapper_read_key_ex;
+    }
+
+    g_org_read_key = gST->ConIn->ReadKeyStroke;
+    gST->ConIn->ReadKeyStroke = ventoy_wrapper_read_key;
+    
+    return EFI_SUCCESS;
+}
+
+EFI_STATUS ventoy_hook_keyboard_stop(VOID)
+{
+    g_blockio_start_record_bcd = FALSE;
+    g_blockio_bcd_read_done = FALSE;
+    g_keyboard_hook_count = 0;
+
+    if (g_con_simple_input_ex)
+    {
+        g_con_simple_input_ex->ReadKeyStrokeEx = g_org_read_key_ex;
+    }
+
+    gST->ConIn->ReadKeyStroke = g_org_read_key;
+
+    return EFI_SUCCESS;
+}
+

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

@@ -0,0 +1,491 @@
+/* test.c -- The test command..  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2007,2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/env.h>
+#include <grub/fs.h>
+#include <grub/device.h>
+#include <grub/file.h>
+#include <grub/command.h>
+#include <grub/i18n.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+static int g_test_case_insensitive = 0;
+
+/* A simple implementation for signed numbers. */
+static int
+grub_strtosl (char *arg, char **end, int base)
+{
+  if (arg[0] == '-')
+    return -grub_strtoul (arg + 1, end, base);
+  return grub_strtoul (arg, end, base);
+}
+
+/* Context for test_parse.  */
+struct test_parse_ctx
+{
+  int invert;
+  int or, and;
+  int file_exists;
+  struct grub_dirhook_info file_info;
+  char *filename;
+};
+
+/* Take care of discarding and inverting. */
+static void
+update_val (int val, struct test_parse_ctx *ctx)
+{
+  ctx->and = ctx->and && (ctx->invert ? ! val : val);
+  ctx->invert = 0;
+}
+
+/* A hook for iterating directories. */
+static int
+find_file (const char *cur_filename, const struct grub_dirhook_info *info,
+	   void *data)
+{
+  int case_insensitive = 0;
+  struct test_parse_ctx *ctx = data;
+
+  if (g_test_case_insensitive || info->case_insensitive)
+    case_insensitive = 1;
+
+  if ((case_insensitive ? grub_strcasecmp (cur_filename, ctx->filename)
+       : grub_strcmp (cur_filename, ctx->filename)) == 0)
+    {
+      ctx->file_info = *info;
+      ctx->file_exists = 1;
+      return 1;
+    }
+  return 0;
+}
+
+/* Check if file exists and fetch its information. */
+static void
+get_fileinfo (char *path, struct test_parse_ctx *ctx)
+{
+  char *pathname;
+  char *device_name;
+  grub_fs_t fs;
+  grub_device_t dev;
+
+  ctx->file_exists = 0;
+  device_name = grub_file_get_device_name (path);
+  dev = grub_device_open (device_name);
+  if (! dev)
+    {
+      grub_free (device_name);
+      return;
+    }
+
+  fs = grub_fs_probe (dev);
+  if (! fs)
+    {
+      grub_free (device_name);
+      grub_device_close (dev);
+      return;
+    }
+
+  pathname = grub_strchr (path, ')');
+  if (! pathname)
+    pathname = path;
+  else
+    pathname++;
+
+  /* Remove trailing '/'. */
+  while (*pathname && pathname[grub_strlen (pathname) - 1] == '/')
+    pathname[grub_strlen (pathname) - 1] = 0;
+
+  /* Split into path and filename. */
+  ctx->filename = grub_strrchr (pathname, '/');
+  if (! ctx->filename)
+    {
+      path = grub_strdup ("/");
+      ctx->filename = pathname;
+    }
+  else
+    {
+      ctx->filename++;
+      path = grub_strdup (pathname);
+      path[ctx->filename - pathname] = 0;
+    }
+
+  /* It's the whole device. */
+  if (! *pathname)
+    {
+      ctx->file_exists = 1;
+      grub_memset (&ctx->file_info, 0, sizeof (ctx->file_info));
+      /* Root is always a directory. */
+      ctx->file_info.dir = 1;
+
+      /* Fetch writing time. */
+      ctx->file_info.mtimeset = 0;
+      if (fs->fs_mtime)
+	{
+	  if (! fs->fs_mtime (dev, &ctx->file_info.mtime))
+	    ctx->file_info.mtimeset = 1;
+	  grub_errno = GRUB_ERR_NONE;
+	}
+    }
+  else
+    (fs->fs_dir) (dev, path, find_file, ctx);
+
+  grub_device_close (dev);
+  grub_free (path);
+  grub_free (device_name);
+}
+
+/* Parse a test expression starting from *argn. */
+static int
+test_parse (char **args, int *argn, int argc)
+{
+  struct test_parse_ctx ctx = {
+    .and = 1,
+    .or = 0,
+    .invert = 0
+  };
+
+  /* Here we have the real parsing. */
+  while (*argn < argc)
+    {
+      /* First try 3 argument tests. */
+      if (*argn + 2 < argc)
+	{
+	  /* String tests. */
+	  if (grub_strcmp (args[*argn + 1], "=") == 0
+	      || grub_strcmp (args[*argn + 1], "==") == 0)
+	    {
+	      update_val (grub_strcmp (args[*argn], args[*argn + 2]) == 0,
+			  &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
+
+	  if (grub_strcmp (args[*argn + 1], "!=") == 0)
+	    {
+	      update_val (grub_strcmp (args[*argn], args[*argn + 2]) != 0,
+			  &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
+
+	  /* GRUB extension: lexicographical sorting. */
+	  if (grub_strcmp (args[*argn + 1], "<") == 0)
+	    {
+	      update_val (grub_strcmp (args[*argn], args[*argn + 2]) < 0,
+			  &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
+
+	  if (grub_strcmp (args[*argn + 1], "<=") == 0)
+	    {
+	      update_val (grub_strcmp (args[*argn], args[*argn + 2]) <= 0,
+			  &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
+
+	  if (grub_strcmp (args[*argn + 1], ">") == 0)
+	    {
+	      update_val (grub_strcmp (args[*argn], args[*argn + 2]) > 0,
+			  &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
+
+	  if (grub_strcmp (args[*argn + 1], ">=") == 0)
+	    {
+	      update_val (grub_strcmp (args[*argn], args[*argn + 2]) >= 0,
+			  &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
+
+	  /* Number tests. */
+	  if (grub_strcmp (args[*argn + 1], "-eq") == 0)
+	    {
+	      update_val (grub_strtosl (args[*argn], 0, 0)
+			  == grub_strtosl (args[*argn + 2], 0, 0), &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
+
+	  if (grub_strcmp (args[*argn + 1], "-ge") == 0)
+	    {
+	      update_val (grub_strtosl (args[*argn], 0, 0)
+			  >= grub_strtosl (args[*argn + 2], 0, 0), &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
+
+	  if (grub_strcmp (args[*argn + 1], "-gt") == 0)
+	    {
+	      update_val (grub_strtosl (args[*argn], 0, 0)
+			  > grub_strtosl (args[*argn + 2], 0, 0), &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
+
+	  if (grub_strcmp (args[*argn + 1], "-le") == 0)
+	    {
+	      update_val (grub_strtosl (args[*argn], 0, 0)
+		      <= grub_strtosl (args[*argn + 2], 0, 0), &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
+
+	  if (grub_strcmp (args[*argn + 1], "-lt") == 0)
+	    {
+	      update_val (grub_strtosl (args[*argn], 0, 0)
+			  < grub_strtosl (args[*argn + 2], 0, 0), &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
+
+	  if (grub_strcmp (args[*argn + 1], "-ne") == 0)
+	    {
+	      update_val (grub_strtosl (args[*argn], 0, 0)
+			  != grub_strtosl (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. */
+	  if (grub_strcmp (args[*argn + 1], "-pgt") == 0
+	      || grub_strcmp (args[*argn + 1], "-plt") == 0)
+	    {
+	      int i;
+	      /* Skip common prefix. */
+	      for (i = 0; args[*argn][i] == args[*argn + 2][i]
+		     && args[*argn][i]; i++);
+
+	      /* Go the digits back. */
+	      i--;
+	      while (grub_isdigit (args[*argn][i]) && i > 0)
+		i--;
+	      i++;
+
+	      if (grub_strcmp (args[*argn + 1], "-pgt") == 0)
+		update_val (grub_strtoul (args[*argn] + i, 0, 0)
+			    > grub_strtoul (args[*argn + 2] + i, 0, 0), &ctx);
+	      else
+		update_val (grub_strtoul (args[*argn] + i, 0, 0)
+			    < grub_strtoul (args[*argn + 2] + i, 0, 0), &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
+
+	  /* -nt and -ot tests. GRUB extension: when doing -?t<bias> bias
+	     will be added to the first mtime. */
+	  if (grub_memcmp (args[*argn + 1], "-nt", 3) == 0
+	      || grub_memcmp (args[*argn + 1], "-ot", 3) == 0)
+	    {
+	      struct grub_dirhook_info file1;
+	      int file1exists;
+	      int bias = 0;
+
+	      /* Fetch fileinfo. */
+	      get_fileinfo (args[*argn], &ctx);
+	      file1 = ctx.file_info;
+	      file1exists = ctx.file_exists;
+	      get_fileinfo (args[*argn + 2], &ctx);
+
+	      if (args[*argn + 1][3])
+		bias = grub_strtosl (args[*argn + 1] + 3, 0, 0);
+
+	      if (grub_memcmp (args[*argn + 1], "-nt", 3) == 0)
+		update_val ((file1exists && ! ctx.file_exists)
+			    || (file1.mtimeset && ctx.file_info.mtimeset
+				&& file1.mtime + bias > ctx.file_info.mtime),
+			    &ctx);
+	      else
+		update_val ((! file1exists && ctx.file_exists)
+			    || (file1.mtimeset && ctx.file_info.mtimeset
+				&& file1.mtime + bias < ctx.file_info.mtime),
+			    &ctx);
+	      (*argn) += 3;
+	      continue;
+	    }
+	}
+
+      /* Two-argument tests. */
+      if (*argn + 1 < argc)
+	{
+	  /* File tests. */
+	  if (grub_strcmp (args[*argn], "-d") == 0)
+	    {
+	      get_fileinfo (args[*argn + 1], &ctx);
+	      update_val (ctx.file_exists && ctx.file_info.dir, &ctx);
+	      (*argn) += 2;
+	      continue;
+	    }
+      
+	  if (grub_strcmp (args[*argn], "-D") == 0)
+	    {
+	      g_test_case_insensitive = 1;
+	      get_fileinfo (args[*argn + 1], &ctx);
+          g_test_case_insensitive = 0;
+	      update_val (ctx.file_exists && ctx.file_info.dir, &ctx);
+	      (*argn) += 2;
+	      continue;
+	    }
+
+	  if (grub_strcmp (args[*argn], "-e") == 0)
+	    {
+	      get_fileinfo (args[*argn + 1], &ctx);
+	      update_val (ctx.file_exists, &ctx);
+	      (*argn) += 2;
+	      continue;
+	    }
+      
+	  if (grub_strcmp (args[*argn], "-E") == 0)
+	    {
+	      g_test_case_insensitive = 1;
+	      get_fileinfo (args[*argn + 1], &ctx);
+          g_test_case_insensitive = 0;
+	      update_val (ctx.file_exists, &ctx);
+	      (*argn) += 2;
+	      continue;
+	    }
+
+	  if (grub_strcmp (args[*argn], "-f") == 0)
+	    {
+	      get_fileinfo (args[*argn + 1], &ctx);
+	      /* FIXME: check for other types. */
+	      update_val (ctx.file_exists && ! ctx.file_info.dir, &ctx);
+	      (*argn) += 2;
+	      continue;
+	    }
+	  if (grub_strcmp (args[*argn], "-F") == 0)
+	    {
+	      g_test_case_insensitive = 1;
+	      get_fileinfo (args[*argn + 1], &ctx);
+          g_test_case_insensitive = 0;
+	      /* FIXME: check for other types. */
+	      update_val (ctx.file_exists && ! ctx.file_info.dir, &ctx);
+	      (*argn) += 2;
+	      continue;
+	    }
+
+	  if (grub_strcmp (args[*argn], "-s") == 0)
+	    {
+	      grub_file_t file;
+	      file = grub_file_open (args[*argn + 1], GRUB_FILE_TYPE_GET_SIZE
+				     | GRUB_FILE_TYPE_NO_DECOMPRESS);
+	      update_val (file && (grub_file_size (file) != 0), &ctx);
+	      if (file)
+		grub_file_close (file);
+	      grub_errno = GRUB_ERR_NONE;
+	      (*argn) += 2;
+	      continue;
+	    }
+
+	  /* String tests. */
+	  if (grub_strcmp (args[*argn], "-n") == 0)
+	    {
+	      update_val (args[*argn + 1][0], &ctx);
+
+	      (*argn) += 2;
+	      continue;
+	    }
+	  if (grub_strcmp (args[*argn], "-z") == 0)
+	    {
+	      update_val (! args[*argn + 1][0], &ctx);
+	      (*argn) += 2;
+	      continue;
+	    }
+	}
+
+      /* Special modifiers. */
+
+      /* End of expression. return to parent. */
+      if (grub_strcmp (args[*argn], ")") == 0)
+	{
+	  (*argn)++;
+	  return ctx.or || ctx.and;
+	}
+      /* Recursively invoke if parenthesis. */
+      if (grub_strcmp (args[*argn], "(") == 0)
+	{
+	  (*argn)++;
+	  update_val (test_parse (args, argn, argc), &ctx);
+	  continue;
+	}
+
+      if (grub_strcmp (args[*argn], "!") == 0)
+	{
+	  ctx.invert = ! ctx.invert;
+	  (*argn)++;
+	  continue;
+	}
+      if (grub_strcmp (args[*argn], "-a") == 0)
+	{
+	  (*argn)++;
+	  continue;
+	}
+      if (grub_strcmp (args[*argn], "-o") == 0)
+	{
+	  ctx.or = ctx.or || ctx.and;
+	  ctx.and = 1;
+	  (*argn)++;
+	  continue;
+	}
+
+      /* No test found. Interpret if as just a string. */
+      update_val (args[*argn][0], &ctx);
+      (*argn)++;
+    }
+  return ctx.or || ctx.and;
+}
+
+static grub_err_t
+grub_cmd_test (grub_command_t cmd __attribute__ ((unused)),
+	       int argc, char **args)
+{
+  int argn = 0;
+
+  if (argc >= 1 && grub_strcmp (args[argc - 1], "]") == 0)
+    argc--;
+
+  return test_parse (args, &argn, argc) ? GRUB_ERR_NONE
+    : grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
+}
+
+static grub_command_t cmd_1, cmd_2;
+
+GRUB_MOD_INIT(test)
+{
+  cmd_1 = grub_register_command ("[", grub_cmd_test,
+				 N_("EXPRESSION ]"), N_("Evaluate an expression."));
+  cmd_1->flags |= GRUB_COMMAND_FLAG_EXTRACTOR;
+  cmd_2 = grub_register_command ("test", grub_cmd_test,
+				 N_("EXPRESSION"), N_("Evaluate an expression."));
+  cmd_2->flags |= GRUB_COMMAND_FLAG_EXTRACTOR;
+}
+
+GRUB_MOD_FINI(test)
+{
+  grub_unregister_command (cmd_1);
+  grub_unregister_command (cmd_2);
+}

GRUB2/MOD_SRC/grub-2.04/grub-core/fs/fshelp.c

@@ -117,6 +117,8 @@ struct grub_fshelp_find_file_iter_ctx
   enum grub_fshelp_filetype *foundtype;
 };
 
+int g_ventoy_case_insensitive = 0;
+
 /* Helper for grub_fshelp_find_file.  */
 static int
 find_file_iter (const char *filename, enum grub_fshelp_filetype filetype,
@@ -124,6 +126,11 @@ find_file_iter (const char *filename, enum grub_fshelp_filetype filetype,
 {
   struct grub_fshelp_find_file_iter_ctx *ctx = data;
 
+  if (g_ventoy_case_insensitive)
+  {
+      filetype |= GRUB_FSHELP_CASE_INSENSITIVE;
+  }
+
   if (filetype == GRUB_FSHELP_UNKNOWN ||
       ((filetype & GRUB_FSHELP_CASE_INSENSITIVE)
        ? grub_strcasecmp (ctx->name, filename)

GRUB2/MOD_SRC/grub-2.04/grub-core/fs/iso9660.c

@@ -32,6 +32,7 @@
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
+static int g_ventoy_no_joliet = 0;
 static grub_uint64_t g_ventoy_last_read_pos = 0;
 static grub_uint64_t g_ventoy_last_read_offset = 0;
 static grub_uint64_t g_ventoy_last_read_dirent_pos = 0;
@@ -480,8 +481,10 @@ grub_iso9660_mount (grub_disk_t disk)
                 (voldesc.escape[2] == 0x43) ||  /* UCS-2 Level 2.  */
                 (voldesc.escape[2] == 0x45)))	/* UCS-2 Level 3.  */
         {
-          copy_voldesc = 1;
+          if (0 == g_ventoy_no_joliet) {
-          data->joliet = 1;
+            copy_voldesc = 1;
+            data->joliet = 1;
+          }
         }
 
       if (copy_voldesc)
@@ -1108,6 +1111,11 @@ grub_iso9660_mtime (grub_device_t device, grub_int32_t *timebuf)
   return err;
 }
 
+void grub_iso9660_set_nojoliet(int nojoliet)
+{
+    g_ventoy_no_joliet = nojoliet;
+}
+
 grub_uint64_t grub_iso9660_get_last_read_pos(grub_file_t file)
 {
     (void)file;

GRUB2/MOD_SRC/grub-2.04/grub-core/kern/disk.c

@@ -27,7 +27,7 @@
 #include <grub/i18n.h>
 #include <grub/ventoy.h>
 
-#define	GRUB_CACHE_TIMEOUT	2
+#define	GRUB_CACHE_TIMEOUT	10
 
 /* The last time the disk was used.  */
 static grub_uint64_t grub_last_time = 0;

GRUB2/MOD_SRC/grub-2.04/grub-core/kern/file.c

@@ -83,6 +83,29 @@ grub_file_t grub_memfile_open(const char *name)
     return file;
 }
 
+int ventoy_check_file_exist(const char * fmt, ...)
+{
+    va_list ap;
+    grub_file_t file;
+    char fullpath[256] = {0};
+
+    va_start (ap, fmt);
+    grub_vsnprintf(fullpath, 255, fmt, ap);
+    va_end (ap);
+
+    file = grub_file_open(fullpath, GRUB_FILE_TYPE_NONE);
+    if (!file)
+    {
+        grub_errno = 0;
+        return 0;
+    }
+    else
+    {
+        grub_file_close(file);
+        return 1;
+    }
+}
+
 grub_file_t
 grub_file_open (const char *name, enum grub_file_type type)
 {

GRUB2/MOD_SRC/grub-2.04/grub-core/kern/main.c

@@ -260,6 +260,45 @@ reclaim_module_space (void)
 #endif
 }
 
+#ifndef GRUB_MACHINE_EFI
+static int ventoy_legacy_limit_workaround(void)
+{
+    grub_file_t file;
+    char *pos, *root;
+    char buf[128];
+
+    root = grub_strdup(grub_env_get("root"));
+    if (!root)
+    {
+        return 1;
+    }
+
+    pos = grub_strchr(root, ',');
+    if (pos) *pos = 0;
+
+    grub_snprintf(buf, sizeof(buf), "(%s,1)/ventoy/ventoy.disk.img.xz", root);
+    file = grub_file_open(buf, GRUB_FILE_TYPE_NONE);
+    if (file)
+    {
+        pos = grub_malloc(file->size);
+        if (pos)
+        {
+            grub_file_read(file, pos, file->size);
+            grub_snprintf(buf, sizeof(buf), "loopback ventoydisk mem:0x%lx:size:%lu", 
+                          (unsigned long)pos, (unsigned long)file->size);
+            
+            grub_parser_execute(buf);
+            grub_env_set("prefix", "(ventoydisk)/grub");
+        }
+
+        grub_file_close(file);
+    }
+
+    grub_free(root);      
+    return 0;
+}
+#endif
+
 /* The main routine.  */
 void __attribute__ ((noreturn))
 grub_main (void)
@@ -293,6 +332,12 @@ grub_main (void)
   grub_env_export ("root");
   grub_env_export ("prefix");
 
+#ifndef GRUB_MACHINE_EFI
+  if (0 == ventoy_check_file_exist("%s/grub.cfg", grub_env_get("prefix"))) {
+      ventoy_legacy_limit_workaround();
+  }
+#endif
+
   /* Reclaim space used for modules.  */
   reclaim_module_space ();
 

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

@@ -38,9 +38,10 @@ int g_ventoy_menu_refresh = 0;
 int g_ventoy_memdisk_mode = 0;
 int g_ventoy_iso_raw = 0;
 int g_ventoy_iso_uefi_drv = 0;
-int g_ventoy_last_entry = 0;
+int g_ventoy_last_entry = -1;
 int g_ventoy_suppress_esc = 0;
 int g_ventoy_menu_esc = 0;
+int g_ventoy_fn_mutex = 0;
 
 /* Time to delay after displaying an error message about a default/fallback
    entry failing to boot.  */
@@ -802,39 +803,53 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 	      goto refresh;
 
         case GRUB_TERM_KEY_F2:
-            cmdstr = grub_env_get("VTOY_F2_CMD");
+            if (0 == g_ventoy_fn_mutex) {
-            if (cmdstr)
+                cmdstr = grub_env_get("VTOY_F2_CMD");
-            {
+                if (cmdstr)
-                menu_fini ();
+                {
-                grub_script_execute_sourcecode(cmdstr);
+                    menu_fini ();
-                goto refresh;
+                    g_ventoy_fn_mutex = 1;
+                    grub_script_execute_sourcecode(cmdstr);
+                    g_ventoy_fn_mutex = 0;
+                    goto refresh;
+                }
             }
             break;
         case GRUB_TERM_KEY_F3:
-            cmdstr = grub_env_get("VTOY_F3_CMD");
+            if (0 == g_ventoy_fn_mutex) {
-            if (cmdstr)
+                cmdstr = grub_env_get("VTOY_F3_CMD");
-            {
+                if (cmdstr)
-                menu_fini ();
+                {
-                grub_script_execute_sourcecode(cmdstr);
+                    menu_fini ();
-                goto refresh;
+                    grub_script_execute_sourcecode(cmdstr);
+                    goto refresh;
+                }
             }
             break;
         case GRUB_TERM_KEY_F4:
-            cmdstr = grub_env_get("VTOY_F4_CMD");
+            if (0 == g_ventoy_fn_mutex) {
-            if (cmdstr)
+                cmdstr = grub_env_get("VTOY_F4_CMD");
-            {
+                if (cmdstr)
-                menu_fini ();
+                {
-                grub_script_execute_sourcecode(cmdstr);
+                    menu_fini ();
-                goto refresh;
+                    g_ventoy_fn_mutex = 1;
+                    grub_script_execute_sourcecode(cmdstr);
+                    g_ventoy_fn_mutex = 0;
+                    goto refresh;
+                }
             }
             break;
         case GRUB_TERM_KEY_F5:
-            cmdstr = grub_env_get("VTOY_F5_CMD");
+            if (0 == g_ventoy_fn_mutex) {
-            if (cmdstr)
+                cmdstr = grub_env_get("VTOY_F5_CMD");
-            {
+                if (cmdstr)
-                menu_fini ();
+                {
-                grub_script_execute_sourcecode(cmdstr);
+                    menu_fini ();
-                goto refresh;
+                    g_ventoy_fn_mutex = 1;
+                    grub_script_execute_sourcecode(cmdstr);
+                    g_ventoy_fn_mutex = 0;
+                    goto refresh;
+                }
             }
             break;
         case GRUB_TERM_KEY_F6:

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

@@ -68,6 +68,8 @@ img_iterator_node *g_img_iterator_tail = NULL;
 
 grub_uint8_t g_ventoy_break_level = 0;
 grub_uint8_t g_ventoy_debug_level = 0;
+grub_uint8_t g_ventoy_chain_type = 0;
+
 grub_uint8_t *g_ventoy_cpio_buf = NULL;
 grub_uint32_t g_ventoy_cpio_size = 0;
 cpio_newc_header *g_ventoy_initrd_head = NULL;
@@ -89,6 +91,15 @@ static int g_tree_script_pos = 0;
 static char *g_list_script_buf = NULL;
 static int g_list_script_pos = 0;
 
+static const char *g_menu_class[] = 
+{
+    "vtoyiso", "vtoywim", "vtoyefi", "vtoyimg"
+};
+    
+static const char *g_menu_prefix[] = 
+{
+    "iso", "wim", "efi", "img"
+};
 
 void ventoy_debug(const char *fmt, ...)
 {
@@ -433,6 +444,27 @@ static grub_err_t ventoy_cmd_load_iso_to_mem(grub_extcmd_context_t ctxt, int arg
     return rc;
 }
 
+static grub_err_t ventoy_cmd_iso9660_nojoliet(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    (void)ctxt;
+
+    if (argc != 1)
+    {
+        return 1;
+    }
+
+    if (args[0][0] == '1')
+    {
+        grub_iso9660_set_nojoliet(1);
+    }
+    else
+    {
+        grub_iso9660_set_nojoliet(0);
+    }
+
+    return 0;
+}
+
 static grub_err_t ventoy_cmd_is_udf(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     int i;
@@ -784,6 +816,12 @@ static int ventoy_colect_img_files(const char *filename, const struct grub_dirho
         {
             type = img_type_wim;
         }
+        #ifdef GRUB_MACHINE_EFI
+        else if (0 == grub_strcasecmp(filename + len - 4, ".efi"))
+        {
+            type = img_type_efi;
+        }
+        #endif
         else
         {
             return 0;
@@ -809,12 +847,12 @@ static int ventoy_colect_img_files(const char *filename, const struct grub_dirho
                 }
             }
             
-            grub_snprintf(img->path, sizeof(img->path), "%s%s", node->dir, img->name);
+            img->pathlen = grub_snprintf(img->path, sizeof(img->path), "%s%s", node->dir, img->name);
 
             img->size = info->size;
             if (0 == img->size)
             {
-                img->size = ventoy_grub_get_file_size("%s/%s", g_iso_path, img->path);
+                img->size = ventoy_grub_get_file_size("%s/%s%s", g_iso_path, node->dir, filename);
             }
 
             if (img->size < VTOY_FILT_MIN_FILE_SIZE)
@@ -853,6 +891,14 @@ static int ventoy_colect_img_files(const char *filename, const struct grub_dirho
             *((img_info **)(node->tail)) = img;
             g_ventoy_img_count++;
 
+            img->alias = ventoy_plugin_get_menu_alias(img->path);
+            img->class = ventoy_plugin_get_menu_class(img->name);
+            if (!img->class)
+            {
+                img->class = g_menu_class[type];
+            }
+            img->menu_prefix = g_menu_prefix[type];
+
             debug("Add %s%s to list %d\n", node->dir, filename, g_ventoy_img_count);
         }
     }
@@ -1001,7 +1047,7 @@ static int ventoy_dynamic_tree_menu(img_iterator_node *node)
         if (g_default_menu_mode == 0)
         {
             vtoy_ssprintf(g_tree_script_buf, g_tree_script_pos, 
-                          "menuentry \"%-10s [Return to ListView]\" VTOY_RET {\n  "
+                          "menuentry \"%-10s [Return to ListView]\" --class=\"vtoyret\" VTOY_RET {\n  "
                           "  echo 'return ...' \n"
                           "}\n", "<--");
         }
@@ -1010,11 +1056,11 @@ static int ventoy_dynamic_tree_menu(img_iterator_node *node)
     {
         node->dir[node->dirlen - 1] = 0;
         vtoy_ssprintf(g_tree_script_buf, g_tree_script_pos, 
-                      "submenu \"%-10s [%s]\" {\n", 
+                      "submenu \"%-10s [%s]\" --class=\"vtoydir\" {\n", 
                       "DIR", node->dir + offset);
 
         vtoy_ssprintf(g_tree_script_buf, g_tree_script_pos, 
-                      "menuentry \"%-10s [../]\" VTOY_RET {\n  "
+                      "menuentry \"%-10s [../]\" --class=\"vtoyret\" VTOY_RET {\n  "
                       "  echo 'return ...' \n"
                       "}\n", "<--");
     }
@@ -1027,12 +1073,13 @@ static int ventoy_dynamic_tree_menu(img_iterator_node *node)
     while ((img = ventoy_get_min_iso(node)) != NULL)
     {
         vtoy_ssprintf(g_tree_script_buf, g_tree_script_pos, 
-                      "menuentry \"%-10s %s%s\" --id=\"VID_%d\" {\n"
+                      "menuentry \"%-10s %s%s\" --class=\"%s\" --id=\"VID_%d\" {\n"
                       "  %s_%s \n" 
                       "}\n", 
                       grub_get_human_size(img->size, GRUB_HUMAN_SIZE_SHORT), 
-                      img->unsupport ? "[unsupported] " : "", img->name, img->id,
+                      img->unsupport ? "[unsupported] " : "", 
-                      (img->type == img_type_iso) ? "iso" : "wim",
+                      img->alias ? img->alias : img->name, img->class, img->id,
+                      img->menu_prefix,
                       img->unsupport ? "unsupport_menuentry" : "common_menuentry");
     }
 
@@ -1052,8 +1099,11 @@ static grub_err_t ventoy_cmd_list_img(grub_extcmd_context_t ctxt, int argc, char
     grub_device_t dev = NULL;
     img_info *cur = NULL;
     img_info *tail = NULL;
+    img_info *default_node = NULL;
     const char *strdata = NULL;
     char *device_name = NULL;
+    const char *default_image = NULL;
+    int img_len = 0;
     char buf[32];
     img_iterator_node *node = NULL;
     img_iterator_node *tmp = NULL;
@@ -1115,7 +1165,7 @@ static grub_err_t ventoy_cmd_list_img(grub_extcmd_context_t ctxt, int argc, char
     if (strdata && strdata[0] == '/')
     {
         len = grub_snprintf(g_img_iterator_head.dir, sizeof(g_img_iterator_head.dir) - 1, "%s", strdata);
-        if (g_img_iterator_head.dir[len] != '/')
+        if (g_img_iterator_head.dir[len - 1] != '/')
         {
             g_img_iterator_head.dir[len++] = '/';
         }
@@ -1163,21 +1213,45 @@ static grub_err_t ventoy_cmd_list_img(grub_extcmd_context_t ctxt, int argc, char
     if (g_default_menu_mode == 1)
     {
         vtoy_ssprintf(g_list_script_buf, g_list_script_pos, 
-                      "menuentry \"%s [Return to TreeView]\" VTOY_RET {\n  "
+                      "menuentry \"%s [Return to TreeView]\" --class=\"vtoyret\" VTOY_RET {\n  "
                       "  echo 'return ...' \n"
                       "}\n", "<--");
     }
 
+    if (g_default_menu_mode == 0)
+    {
+        default_image = ventoy_get_env("VTOY_DEFAULT_IMAGE");        
+        if (default_image)
+        {
+            img_len = grub_strlen(default_image);
+        }
+    }
+
     for (cur = g_ventoy_img_list; cur; cur = cur->next)
     {
         vtoy_ssprintf(g_list_script_buf, g_list_script_pos,
-                  "menuentry \"%s%s\" --id=\"VID_%d\" {\n"
+                  "menuentry \"%s%s\" --class=\"%s\" --id=\"VID_%d\" {\n"
                   "  %s_%s \n" 
                   "}\n", 
-                  cur->unsupport ? "[unsupported] " : "", cur->name, cur->id,
+                  cur->unsupport ? "[unsupported] " : "", 
-                  (cur->type == img_type_iso) ? "iso" : "wim",
+                  cur->alias ? cur->alias : cur->name, cur->class, cur->id,
+                  cur->menu_prefix,
                   cur->unsupport ? "unsupport_menuentry" : "common_menuentry");
+
+        if (g_default_menu_mode == 0 && default_image && default_node == NULL)
+        {
+            if (img_len == cur->pathlen && grub_strcmp(default_image, cur->path) == 0)
+            {
+                default_node = cur;
+            }
+        }
     }
+
+    if (default_node)
+    {
+        vtoy_ssprintf(g_list_script_buf, g_list_script_pos, "set default='VID_%d'\n", default_node->id);
+    }
+    
     g_list_script_buf[g_list_script_pos] = 0;
 
     grub_snprintf(buf, sizeof(buf), "%d", g_ventoy_img_count);
@@ -1394,6 +1468,8 @@ int ventoy_has_efi_eltorito(grub_file_t file, grub_uint32_t sector)
 void ventoy_fill_os_param(grub_file_t file, ventoy_os_param *param)
 {
     char *pos;
+    const char *fs = NULL;
+    const char *cdprompt = NULL;
     grub_uint32_t i;
     grub_uint8_t  chksum = 0;
     grub_disk_t   disk;
@@ -1419,6 +1495,25 @@ void ventoy_fill_os_param(grub_file_t file, ventoy_os_param *param)
 
     param->vtoy_reserved[0] = g_ventoy_break_level;
     param->vtoy_reserved[1] = g_ventoy_debug_level;
+    
+    param->vtoy_reserved[2] = g_ventoy_chain_type;
+
+    /* Windows CD/DVD prompt   0:suppress  1:reserved */
+    param->vtoy_reserved[4] = 0;
+    if (g_ventoy_chain_type == 1) /* Windows */
+    {
+        cdprompt = ventoy_get_env("VTOY_WINDOWS_CD_PROMPT");
+        if (cdprompt && cdprompt[0] == '1' && cdprompt[1] == 0)
+        {
+            param->vtoy_reserved[4] = 1;
+        }
+    }
+    
+    fs = ventoy_get_env("ventoy_fs_probe");
+    if (fs && grub_strcmp(fs, "udf") == 0)
+    {
+        param->vtoy_reserved[3] = 1;
+    }
 
     /* calculate checksum */
     for (i = 0; i < sizeof(ventoy_os_param); i++)
@@ -1567,6 +1662,8 @@ static grub_err_t ventoy_cmd_sel_auto_install(grub_extcmd_context_t ctxt, int ar
     (void)argc;
     (void)args;
 
+    debug("select auto installation %d\n", argc);
+
     if (argc < 1)
     {
         return 0;
@@ -1575,6 +1672,7 @@ static grub_err_t ventoy_cmd_sel_auto_install(grub_extcmd_context_t ctxt, int ar
     node = ventoy_plugin_find_install_template(args[0]);
     if (!node)
     {
+        debug("Install template not found for %s\n", args[0]);
         return 0;
     }
 
@@ -1622,6 +1720,8 @@ static grub_err_t ventoy_cmd_sel_persistence(grub_extcmd_context_t ctxt, int arg
     (void)argc;
     (void)args;
 
+    debug("select persistece %d\n", argc);
+
     if (argc < 1)
     {
         return 0;
@@ -1630,6 +1730,7 @@ static grub_err_t ventoy_cmd_sel_persistence(grub_extcmd_context_t ctxt, int arg
     node = ventoy_plugin_find_persistent(args[0]);
     if (!node)
     {
+        debug("Persistence image not found for %s\n", args[0]);
         return 0;
     }
 
@@ -1854,12 +1955,51 @@ static grub_err_t ventoy_cmd_dump_menu(grub_extcmd_context_t ctxt, int argc, cha
     return 0;
 }
 
+static grub_err_t ventoy_cmd_dump_img_list(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    img_info *cur = g_ventoy_img_list;
+        
+    (void)ctxt;
+    (void)argc;
+    (void)args;
+
+    while (cur)
+    {
+        grub_printf("path:<%s> id=%d\n", cur->path, cur->id);
+        grub_printf("name:<%s>\n\n", cur->name);
+        cur = cur->next;
+    }
+
+    return 0;
+}
+
 static grub_err_t ventoy_cmd_dump_auto_install(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     (void)ctxt;
     (void)argc;
     (void)args;
 
+{
+    grub_file_t file;
+    char *buf;
+    char name[128];
+
+    file = grub_file_open("(hd0,1)/ventoy/ventoy.disk.img.xz", GRUB_FILE_TYPE_NONE);
+    if (file)
+    {
+        grub_printf("Open File OK (size:%llu)\n", (ulonglong)file->size);
+
+        buf = grub_malloc(file->size);
+        grub_file_read(file, buf, file->size);
+
+        grub_file_close(file);
+
+        grub_snprintf(name, sizeof(name), "mem:0x%llx:size:%llu", (ulonglong)(ulong)buf, (ulonglong)file->size);
+        grub_printf("<%s>\n", name);
+    }
+}
+
+
     ventoy_plugin_dump_auto_install();
 
     return 0;
@@ -1962,6 +2102,31 @@ static grub_err_t ventoy_cmd_dynamic_menu(grub_extcmd_context_t ctxt, int argc,
     return 0;
 }
 
+static grub_err_t ventoy_cmd_file_exist_nocase(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    grub_file_t file;
+
+    (void)ctxt;
+
+    if (argc != 1)
+    {
+        return 1;
+    }
+    
+    g_ventoy_case_insensitive = 1;
+    file = grub_file_open(args[0], VENTOY_FILE_TYPE);
+    g_ventoy_case_insensitive = 0;
+
+    grub_errno = 0;
+
+    if (file)
+    {
+        grub_file_close(file);
+        return 0;
+    }
+    return 1;
+}
+
 static grub_err_t ventoy_cmd_find_bootable_hdd(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     int id = 0;
@@ -2109,6 +2274,8 @@ static int ventoy_env_init(void)
     grub_env_set("vtdebug_flag", "");
     grub_env_export("vtdebug_flag");
 
+
+
     g_tree_script_buf = grub_malloc(VTOY_MAX_SCRIPT_BUF);
     g_list_script_buf = grub_malloc(VTOY_MAX_SCRIPT_BUF);
 
@@ -2146,11 +2313,13 @@ static cmd_para ventoy_cmds[] =
     { "vt_dump_menu", ventoy_cmd_dump_menu, 0, NULL, "", "", NULL },
     { "vt_dynamic_menu", ventoy_cmd_dynamic_menu, 0, NULL, "", "", NULL },
     { "vt_check_mode", ventoy_cmd_check_mode, 0, NULL, "", "", NULL },
+    { "vt_dump_img_list", ventoy_cmd_dump_img_list, 0, NULL, "", "", NULL },
     { "vt_dump_auto_install", ventoy_cmd_dump_auto_install, 0, NULL, "", "", NULL },
     { "vt_dump_persistence", ventoy_cmd_dump_persistence, 0, NULL, "", "", NULL },
     { "vt_select_auto_install", ventoy_cmd_sel_auto_install, 0, NULL, "", "", NULL },
     { "vt_select_persistence", ventoy_cmd_sel_persistence, 0, NULL, "", "", NULL },
 
+    { "vt_iso9660_nojoliet", ventoy_cmd_iso9660_nojoliet, 0, NULL, "", "", NULL },
     { "vt_is_udf", ventoy_cmd_is_udf, 0, NULL, "", "", NULL },
     { "vt_file_size", ventoy_cmd_file_size, 0, NULL, "", "", NULL },
     { "vt_load_iso_to_mem", ventoy_cmd_load_iso_to_mem, 0, NULL, "", "", NULL },
@@ -2164,18 +2333,25 @@ static cmd_para ventoy_cmds[] =
     { "vt_linux_valid_initrd_count", ventoy_cmd_valid_initrd_count, 0, NULL, "", "", NULL },
     { "vt_linux_locate_initrd", ventoy_cmd_linux_locate_initrd, 0, NULL, "", "", NULL },
     { "vt_linux_chain_data", ventoy_cmd_linux_chain_data, 0, NULL, "", "", NULL },
+    { "vt_linux_get_main_initrd_index", ventoy_cmd_linux_get_main_initrd_index, 0, NULL, "", "", NULL },
 
     { "vt_windows_reset",      ventoy_cmd_wimdows_reset, 0, NULL, "", "", NULL },
-    { "vt_windows_locate_wim", ventoy_cmd_wimdows_locate_wim, 0, NULL, "", "", NULL },
     { "vt_windows_chain_data", ventoy_cmd_windows_chain_data, 0, NULL, "", "", NULL },
+    { "vt_windows_collect_wim_patch", ventoy_cmd_collect_wim_patch, 0, NULL, "", "", NULL },
+    { "vt_windows_locate_wim_patch", ventoy_cmd_locate_wim_patch, 0, NULL, "", "", NULL },
+    { "vt_windows_count_wim_patch", ventoy_cmd_wim_patch_count, 0, NULL, "", "", NULL },
+    { "vt_dump_wim_patch", ventoy_cmd_dump_wim_patch, 0, NULL, "", "", NULL },
     { "vt_wim_chain_data", ventoy_cmd_wim_chain_data, 0, NULL, "", "", NULL },
 
     { "vt_add_replace_file", ventoy_cmd_add_replace_file, 0, NULL, "", "", NULL },
     { "vt_relocator_chaindata", ventoy_cmd_relocator_chaindata, 0, NULL, "", "", NULL },
     { "vt_test_block_list", ventoy_cmd_test_block_list, 0, NULL, "", "", NULL },
+    { "vt_file_exist_nocase", ventoy_cmd_file_exist_nocase, 0, NULL, "", "", NULL },
 
     
     { "vt_load_plugin", ventoy_cmd_load_plugin, 0, NULL, "", "", NULL },
+    { "vt_check_plugin_json", ventoy_cmd_plugin_check_json, 0, NULL, "", "", NULL },
+
 };
 
 

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

@@ -127,11 +127,19 @@ typedef struct ventoy_udf_override
 
 #define img_type_iso 0
 #define img_type_wim 1
+#define img_type_efi 2
+#define img_type_img 3
 
 typedef struct img_info
 {
+    int pathlen;
     char path[512];
     char name[256];
+
+    const char *alias;
+    const char *class;
+    const char *menu_prefix;
+    
     int id;
     int type;
     grub_uint64_t size;
@@ -363,6 +371,19 @@ typedef struct wim_tail
     grub_uint32_t new_lookup_align_len;
 }wim_tail;
 
+typedef struct wim_patch
+{
+    int pathlen;
+    char path[256];
+
+    wim_hash old_hash;
+    wim_tail wim_data;
+    wim_lookup_entry *replace_look;
+
+    int valid;
+
+    struct wim_patch *next;
+}wim_patch;
 
 
 typedef enum _JSON_TYPE
@@ -412,11 +433,13 @@ typedef struct _JSON_PARSE
 }
 
 typedef int (*ventoy_plugin_entry_pf)(VTOY_JSON *json, const char *isodisk);
+typedef int (*ventoy_plugin_check_pf)(VTOY_JSON *json, const char *isodisk);
 
 typedef struct plugin_entry
 {
     const char *key;
     ventoy_plugin_entry_pf entryfunc;
+    ventoy_plugin_check_pf checkfunc;
 }plugin_entry;
 
 
@@ -440,9 +463,9 @@ int ventoy_is_file_exist(const char *fmt, ...);
 int ventoy_fill_data(grub_uint32_t buflen, char *buffer);
 grub_err_t ventoy_cmd_load_plugin(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_wimdows_reset(grub_extcmd_context_t ctxt, int argc, char **args);
-grub_err_t ventoy_cmd_wimdows_locate_wim(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_windows_chain_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_dump_wim_patch(grub_extcmd_context_t ctxt, int argc, char **args);
 
 VTOY_JSON *vtoy_json_find_item
 (
@@ -596,12 +619,32 @@ typedef struct persistence_config
     struct persistence_config *next;
 }persistence_config;
 
+typedef struct menu_alias
+{
+    int pathlen;
+    char isopath[256];
+    char alias[256];
+
+    struct menu_alias *next;
+}menu_alias;
+
+typedef struct menu_class
+{
+    int  patlen;
+    char pattern[256];
+    char class[64];
+
+    struct menu_class *next;
+}menu_class;
+
 extern int g_ventoy_menu_esc;
 extern int g_ventoy_suppress_esc;
 extern int g_ventoy_last_entry;
 extern int g_ventoy_memdisk_mode;
 extern int g_ventoy_iso_raw;
 extern int g_ventoy_iso_uefi_drv;
+extern int g_ventoy_case_insensitive;
+extern grub_uint8_t g_ventoy_chain_type;
 
 int ventoy_cmp_img(img_info *img1, img_info *img2);
 void ventoy_swap_img(img_info *img1, img_info *img2);
@@ -611,9 +654,16 @@ persistence_config * ventoy_plugin_find_persistent(const char *isopath);
 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_menu_alias(const char *isopath);
+const char * ventoy_plugin_get_menu_class(const char *isoname);
 int ventoy_get_block_list(grub_file_t file, ventoy_img_chunk_list *chunklist, grub_disk_addr_t start);
 int ventoy_check_block_list(grub_file_t file, ventoy_img_chunk_list *chunklist, grub_disk_addr_t start);
 void ventoy_plugin_dump_persistence(void);
+grub_err_t ventoy_cmd_plugin_check_json(grub_extcmd_context_t ctxt, int argc, char **args);
+grub_err_t ventoy_cmd_linux_get_main_initrd_index(grub_extcmd_context_t ctxt, int argc, char **args);
+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);
 
 #endif /* __VENTOY_DEF_H__ */
 

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

@@ -42,6 +42,11 @@ static void json_debug(const char *fmt, ...)
 {
     va_list args;
 
+    if (g_ventoy_debug == 0)
+    {
+        return;
+    }
+
     va_start (args, fmt);
     grub_vprintf (fmt, args);
     va_end (args);

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

@@ -841,6 +841,50 @@ static grub_err_t ventoy_linux_locate_initrd(int filt, int *filtcnt)
 }
 
 
+grub_err_t ventoy_cmd_linux_get_main_initrd_index(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    int index = 0;
+    char buf[32];
+    initrd_info *node = NULL;
+    
+    (void)ctxt;
+    (void)argc;
+    (void)args;
+
+    if (argc != 1)
+    {
+        return 1;
+    }
+
+    if (g_initrd_img_count == 1)
+    {
+        ventoy_set_env(args[0], "0");
+        VENTOY_CMD_RETURN(GRUB_ERR_NONE);
+    }
+
+    for (node = g_initrd_img_list; node; node = node->next)
+    {
+        if (node->size <= 0)
+        {
+            continue;
+        }
+    
+        if (grub_strstr(node->name, "ucode") || grub_strstr(node->name, "-firmware"))
+        {
+            index++;
+            continue;
+        }
+
+        grub_snprintf(buf, sizeof(buf), "%d", index);
+        ventoy_set_env(args[0], buf);
+        break;
+    }
+
+    debug("main initrd index:%d\n", index);
+
+    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
+}
+
 grub_err_t ventoy_cmd_linux_locate_initrd(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     int sizefilt = 0;
@@ -1100,6 +1144,7 @@ grub_err_t ventoy_cmd_linux_chain_data(grub_extcmd_context_t ctxt, int argc, cha
     grub_memset(chain, 0, sizeof(ventoy_chain_head));
 
     /* part 1: os parameter */
+    g_ventoy_chain_type = 0;
     ventoy_fill_os_param(file, &(chain->os_param));
 
     /* part 2: chain head */

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

@@ -33,6 +33,7 @@
 #include <grub/i18n.h>
 #include <grub/net.h>
 #include <grub/time.h>
+#include <grub/font.h>
 #include <grub/ventoy.h>
 #include "ventoy_def.h"
 
@@ -41,6 +42,47 @@ GRUB_MOD_LICENSE ("GPLv3+");
 static char g_iso_disk_name[128];
 static install_template *g_install_template_head = NULL;
 static persistence_config *g_persistence_head = NULL;
+static menu_alias *g_menu_alias_head = NULL;
+static menu_class *g_menu_class_head = NULL;
+
+static int ventoy_plugin_control_check(VTOY_JSON *json, const char *isodisk)
+{
+    int rc = 0;
+    VTOY_JSON *pNode = NULL;
+    VTOY_JSON *pChild = NULL;
+
+    (void)isodisk;
+
+    if (json->enDataType != JSON_TYPE_ARRAY)
+    {
+        grub_printf("Not array type %d\n", json->enDataType);
+        return 1;
+    }
+
+    for (pNode = json->pstChild; pNode; pNode = pNode->pstNext)
+    {
+        if (pNode->enDataType == JSON_TYPE_OBJECT)
+        {
+            pChild = pNode->pstChild;
+            if (pChild->enDataType == JSON_TYPE_STRING)
+            {
+                grub_printf("%s: %s\n", pChild->pcName, pChild->unData.pcStrVal);
+            }
+            else
+            {
+                grub_printf("%s is NOT string type\n", pChild->pcName);
+                rc = 1;
+            }
+        }
+        else
+        {
+            grub_printf("%s is not an object\n", pNode->pcName);
+            rc = 1;
+        }
+    }
+
+    return rc;
+}
 
 static int ventoy_plugin_control_entry(VTOY_JSON *json, const char *isodisk)
 {
@@ -70,10 +112,93 @@ static int ventoy_plugin_control_entry(VTOY_JSON *json, const char *isodisk)
     return 0;
 }
 
+static int ventoy_plugin_theme_check(VTOY_JSON *json, const char *isodisk)
+{
+    int exist = 0;
+    const char *value;
+    VTOY_JSON *node;
+    
+    value = vtoy_json_get_string_ex(json->pstChild, "file");
+    if (value)
+    {
+        grub_printf("file: %s\n", value);
+        if (value[0] == '/')
+        {
+            exist = ventoy_is_file_exist("%s%s", isodisk, value);
+        }
+        else
+        {
+            exist = ventoy_is_file_exist("%s/ventoy/%s", isodisk, value);
+        }
+        
+        if (exist == 0)
+        {
+            grub_printf("Theme file %s does NOT exist\n", value);
+            return 1;
+        }
+    }
+    
+    value = vtoy_json_get_string_ex(json->pstChild, "gfxmode");
+    if (value)
+    {
+        grub_printf("gfxmode: %s\n", value);
+    }
+    
+    value = vtoy_json_get_string_ex(json->pstChild, "display_mode");
+    if (value)
+    {
+        grub_printf("display_mode: %s\n", value);
+    }
+
+    value = vtoy_json_get_string_ex(json->pstChild, "ventoy_left");
+    if (value)
+    {
+        grub_printf("ventoy_left: %s\n", value);
+    }
+    
+    value = vtoy_json_get_string_ex(json->pstChild, "ventoy_top");
+    if (value)
+    {
+        grub_printf("ventoy_top: %s\n", value);
+    }
+    
+    value = vtoy_json_get_string_ex(json->pstChild, "ventoy_color");
+    if (value)
+    {
+        grub_printf("ventoy_color: %s\n", value);
+    }
+
+    node = vtoy_json_find_item(json->pstChild, JSON_TYPE_ARRAY, "fonts");
+    if (node)
+    {
+        for (node = node->pstChild; node; node = node->pstNext)
+        {
+            if (node->enDataType == JSON_TYPE_STRING)
+            {
+                if (ventoy_check_file_exist("%s%s", isodisk, node->unData.pcStrVal))
+                {
+                    grub_printf("%s [OK]\n", node->unData.pcStrVal);
+                }
+                else
+                {
+                    grub_printf("%s [NOT EXIST]\n", node->unData.pcStrVal);
+                }
+            }
+        }
+    }
+    else
+    {
+        grub_printf("fonts NOT found\n");
+    }
+
+    return 0;
+}
+
 static int ventoy_plugin_theme_entry(VTOY_JSON *json, const char *isodisk)
 {
     const char *value;
     char filepath[256];
+    VTOY_JSON *node;
     
     value = vtoy_json_get_string_ex(json->pstChild, "file");
     if (value)
@@ -104,6 +229,13 @@ static int ventoy_plugin_theme_entry(VTOY_JSON *json, const char *isodisk)
         grub_env_set("vtoy_gfxmode", value);
     }
     
+    value = vtoy_json_get_string_ex(json->pstChild, "display_mode");
+    if (value)
+    {
+        debug("display_mode %s\n", value);
+        grub_env_set("vtoy_display_mode", value);
+    }
+
     value = vtoy_json_get_string_ex(json->pstChild, "ventoy_left");
     if (value)
     {
@@ -122,9 +254,109 @@ static int ventoy_plugin_theme_entry(VTOY_JSON *json, const char *isodisk)
         grub_env_set("VTLE_CLR", value);
     }
 
+    node = vtoy_json_find_item(json->pstChild, JSON_TYPE_ARRAY, "fonts");
+    if (node)
+    {
+        for (node = node->pstChild; node; node = node->pstNext)
+        {
+            if (node->enDataType == JSON_TYPE_STRING && 
+                ventoy_check_file_exist("%s%s", isodisk, node->unData.pcStrVal))
+            {
+                grub_snprintf(filepath, sizeof(filepath), "%s%s", isodisk, node->unData.pcStrVal);
+                grub_font_load(filepath);
+            }
+        }
+    }
+
     return 0;
 }
 
+static int ventoy_plugin_check_path(const char *path, const char *file)
+{
+    if (file[0] != '/')
+    {
+        grub_printf("%s is NOT begin with '/' \n", file);
+        return 1;
+    }
+
+    if (grub_strchr(file, '\\'))
+    {
+        grub_printf("%s contains invalid '\\' \n", file);
+        return 1;
+    }
+    
+    if (grub_strstr(file, "//"))
+    {
+        grub_printf("%s contains invalid double slash\n", file);
+        return 1;
+    }
+
+    if (grub_strstr(file, "../"))
+    {
+        grub_printf("%s contains invalid '../' \n", file);
+        return 1;
+    }
+
+    if (!ventoy_is_file_exist("%s%s", path, file))
+    {
+        grub_printf("%s%s does NOT exist\n", path, file);
+        return 1;
+    }
+
+    return 0;
+}
+
+static int ventoy_plugin_check_fullpath
+(
+    VTOY_JSON *json, 
+    const char *isodisk, 
+    const char *key
+)
+{
+    int rc = 0;
+    int ret = 0;
+    VTOY_JSON *node = json;
+    VTOY_JSON *child = NULL;
+    
+    while (node)
+    {
+        if (0 == grub_strcmp(key, node->pcName))
+        {
+            break;
+        }
+        node = node->pstNext;
+    }
+
+    if (!node)
+    {
+        return 1;
+    }
+
+    if (JSON_TYPE_STRING == node->enDataType)
+    {
+        ret = ventoy_plugin_check_path(isodisk, node->unData.pcStrVal);
+        grub_printf("%s: %s [%s]\n", key, node->unData.pcStrVal, ret ? "FAIL" : "OK");
+    }
+    else if (JSON_TYPE_ARRAY == node->enDataType)
+    {
+        for (child = node->pstChild; child; child = child->pstNext)
+        {
+            if (JSON_TYPE_STRING != child->enDataType)
+            {
+                grub_printf("Non string json type\n");
+            }
+            else
+            {
+                rc = ventoy_plugin_check_path(isodisk, child->unData.pcStrVal);
+                grub_printf("%s: %s [%s]\n", key, child->unData.pcStrVal, rc ? "FAIL" : "OK");
+                ret += rc;
+            }
+        }
+    }
+
+    return ret;
+}
+
 static int ventoy_plugin_parse_fullpath
 (
     VTOY_JSON *json, 
@@ -209,6 +441,46 @@ static int ventoy_plugin_parse_fullpath
     return rc;
 }
 
+static int ventoy_plugin_auto_install_check(VTOY_JSON *json, const char *isodisk)
+{
+    const char *iso = NULL;
+    VTOY_JSON *pNode = NULL;
+
+    if (json->enDataType != JSON_TYPE_ARRAY)
+    {
+        grub_printf("Not array type %d\n", json->enDataType);
+        return 1;
+    }
+
+    for (pNode = json->pstChild; pNode; pNode = pNode->pstNext)
+    {
+        if (pNode->enDataType != JSON_TYPE_OBJECT)
+        {
+            grub_printf("NOT object type\n");
+        }
+    
+        iso = vtoy_json_get_string_ex(pNode->pstChild, "image");
+        if (iso)
+        {
+            if (0 == ventoy_plugin_check_path(isodisk, iso))
+            {
+                grub_printf("image: %s [OK]\n", iso);
+                ventoy_plugin_check_fullpath(pNode->pstChild, isodisk, "template");
+            }
+            else
+            {
+                grub_printf("image: %s [FAIL]\n", iso);
+            }
+        }
+        else
+        {
+            grub_printf("image not found\n");
+        }
+    }
+
+    return 0;
+}
+
 static int ventoy_plugin_auto_install_entry(VTOY_JSON *json, const char *isodisk)
 {
     int pathnum = 0;
@@ -264,6 +536,45 @@ static int ventoy_plugin_auto_install_entry(VTOY_JSON *json, const char *isodisk
     return 0;
 }
 
+static int ventoy_plugin_persistence_check(VTOY_JSON *json, const char *isodisk)
+{
+    const char *iso = NULL;
+    VTOY_JSON *pNode = NULL;
+
+    if (json->enDataType != JSON_TYPE_ARRAY)
+    {
+        grub_printf("Not array type %d\n", json->enDataType);
+        return 1;
+    }
+
+    for (pNode = json->pstChild; pNode; pNode = pNode->pstNext)
+    {
+        if (pNode->enDataType != JSON_TYPE_OBJECT)
+        {
+            grub_printf("NOT object type\n");
+        }
+    
+        iso = vtoy_json_get_string_ex(pNode->pstChild, "image");
+        if (iso)
+        {
+            if (0 == ventoy_plugin_check_path(isodisk, iso))
+            {
+                grub_printf("image: %s [OK]\n", iso);
+                ventoy_plugin_check_fullpath(pNode->pstChild, isodisk, "backend");
+            } 
+            else
+            {
+                grub_printf("image: %s [FAIL]\n", iso);
+            }
+        }
+        else
+        {
+            grub_printf("image not found\n");
+        }
+    }
+
+    return 0;
+}
 
 static int ventoy_plugin_persistence_entry(VTOY_JSON *json, const char *isodisk)
 {
@@ -322,13 +633,186 @@ static int ventoy_plugin_persistence_entry(VTOY_JSON *json, const char *isodisk)
     return 0;
 }
 
+static int ventoy_plugin_menualias_check(VTOY_JSON *json, const char *isodisk)
+{
+    const char *iso = NULL;
+    const char *alias = NULL;
+    VTOY_JSON *pNode = NULL;
+
+    (void)isodisk;
+
+    if (json->enDataType != JSON_TYPE_ARRAY)
+    {
+        grub_printf("Not array %d\n", json->enDataType);
+        return 1;
+    }
+
+    for (pNode = json->pstChild; pNode; pNode = pNode->pstNext)
+    {
+        iso = vtoy_json_get_string_ex(pNode->pstChild, "image");
+        alias = vtoy_json_get_string_ex(pNode->pstChild, "alias");
+        if (iso && iso[0] == '/' && alias)
+        {
+            if (ventoy_is_file_exist("%s%s", isodisk, iso))
+            {
+                grub_printf("image: <%s> [ OK ]\n", iso);
+            }
+            else
+            {
+                grub_printf("image: <%s> [ NOT EXIST ]\n", iso);
+            }
+
+            grub_printf("alias: <%s>\n\n", alias);
+        }
+    }
+
+    return 0;
+}
+
+static int ventoy_plugin_menualias_entry(VTOY_JSON *json, const char *isodisk)
+{
+    const char *iso = NULL;
+    const char *alias = NULL;
+    VTOY_JSON *pNode = NULL;
+    menu_alias *node = NULL;
+    menu_alias *next = NULL;
+
+    (void)isodisk;
+
+    if (json->enDataType != JSON_TYPE_ARRAY)
+    {
+        debug("Not array %d\n", json->enDataType);
+        return 0;
+    }
+
+    if (g_menu_alias_head)
+    {
+        for (node = g_menu_alias_head; node; node = next)
+        {
+            next = node->next;
+            grub_free(node);
+        }
+
+        g_menu_alias_head = NULL;
+    }
+
+    for (pNode = json->pstChild; pNode; pNode = pNode->pstNext)
+    {
+        iso = vtoy_json_get_string_ex(pNode->pstChild, "image");
+        alias = vtoy_json_get_string_ex(pNode->pstChild, "alias");
+        if (iso && iso[0] == '/' && alias)
+        {
+            node = grub_zalloc(sizeof(menu_alias));
+            if (node)
+            {
+                node->pathlen = grub_snprintf(node->isopath, sizeof(node->isopath), "%s", iso);
+                grub_snprintf(node->alias, sizeof(node->alias), "%s", alias);
+
+                if (g_menu_alias_head)
+                {
+                    node->next = g_menu_alias_head;
+                }
+                
+                g_menu_alias_head = node;
+            }
+        }
+    }
+
+    return 0;
+}
+
+static int ventoy_plugin_menuclass_entry(VTOY_JSON *json, const char *isodisk)
+{
+    const char *key = NULL;
+    const char *class = NULL;
+    VTOY_JSON *pNode = NULL;
+    menu_class *tail = NULL;
+    menu_class *node = NULL;
+    menu_class *next = NULL;
+
+    (void)isodisk;
+
+    if (json->enDataType != JSON_TYPE_ARRAY)
+    {
+        debug("Not array %d\n", json->enDataType);
+        return 0;
+    }
+
+    if (g_menu_class_head)
+    {
+        for (node = g_menu_class_head; node; node = next)
+        {
+            next = node->next;
+            grub_free(node);
+        }
+
+        g_menu_class_head = NULL;
+    }
+
+    for (pNode = json->pstChild; pNode; pNode = pNode->pstNext)
+    {
+        key = vtoy_json_get_string_ex(pNode->pstChild, "key");
+        class = vtoy_json_get_string_ex(pNode->pstChild, "class");
+        if (key && class)
+        {
+            node = grub_zalloc(sizeof(menu_class));
+            if (node)
+            {
+                node->patlen = grub_snprintf(node->pattern, sizeof(node->pattern), "%s", key);
+                grub_snprintf(node->class, sizeof(node->class), "%s", class);
+
+                if (g_menu_class_head)
+                {
+                    tail->next = node;
+                }
+                else
+                {
+                    g_menu_class_head = node;
+                }
+                tail = node;
+            }
+        }
+    }
+
+    return 0;
+}
+
+static int ventoy_plugin_menuclass_check(VTOY_JSON *json, const char *isodisk)
+{
+    const char *key = NULL;
+    const char *class = NULL;
+    VTOY_JSON *pNode = NULL;
+
+    (void)isodisk;
+
+    if (json->enDataType != JSON_TYPE_ARRAY)
+    {
+        grub_printf("Not array %d\n", json->enDataType);
+        return 1;
+    }
+
+    for (pNode = json->pstChild; pNode; pNode = pNode->pstNext)
+    {
+        key = vtoy_json_get_string_ex(pNode->pstChild, "key");
+        class = vtoy_json_get_string_ex(pNode->pstChild, "class");
+        if (key && class)
+        {
+            grub_printf("key: <%s>\n", key);
+            grub_printf("class: <%s>\n\n", class);
+        }
+    }
+
+    return 0;
+}
 
 static plugin_entry g_plugin_entries[] = 
 {
-    { "control", ventoy_plugin_control_entry },
+    { "control", ventoy_plugin_control_entry, ventoy_plugin_control_check },
-    { "theme", ventoy_plugin_theme_entry },
+    { "theme", ventoy_plugin_theme_entry, ventoy_plugin_theme_check },
-    { "auto_install", ventoy_plugin_auto_install_entry },
+    { "auto_install", ventoy_plugin_auto_install_entry, ventoy_plugin_auto_install_check },
-    { "persistence", ventoy_plugin_persistence_entry },
+    { "persistence", ventoy_plugin_persistence_entry, ventoy_plugin_persistence_check },
+    { "menu_alias", ventoy_plugin_menualias_entry, ventoy_plugin_menualias_check },
+    { "menu_class", ventoy_plugin_menuclass_entry, ventoy_plugin_menuclass_check },
 };
 
 static int ventoy_parse_plugin_config(VTOY_JSON *json, const char *isodisk)
@@ -566,3 +1050,117 @@ end:
     return rc;
 }
 
+const char * ventoy_plugin_get_menu_alias(const char *isopath)
+{
+    menu_alias *node = NULL;
+    int len = (int)grub_strlen(isopath);
+    
+    for (node = g_menu_alias_head; node; node = node->next)
+    {
+        if (node->pathlen == len && grub_strcmp(node->isopath, isopath) == 0)
+        {
+            return node->alias;
+        }
+    }
+
+    return NULL;
+}
+
+const char * ventoy_plugin_get_menu_class(const char *isoname)
+{
+    menu_class *node = NULL;
+    int len = (int)grub_strlen(isoname);
+    
+    for (node = g_menu_class_head; node; node = node->next)
+    {
+        if (node->patlen <= len && grub_strstr(isoname, node->pattern))
+        {
+            return node->class;
+        }
+    }
+
+    return NULL;
+}
+
+
+grub_err_t ventoy_cmd_plugin_check_json(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    int i = 0;
+    int ret = 0;
+    char *buf = NULL;
+    grub_file_t file;
+    VTOY_JSON *node = NULL;
+    VTOY_JSON *json = NULL;
+    
+    (void)ctxt;
+
+    if (argc != 3)
+    {
+        return 0;
+    }
+
+    file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s/ventoy/ventoy.json", args[0]);
+    if (!file)
+    {
+        grub_printf("Plugin json file /ventoy/ventoy.json does NOT exist.\n");
+        goto end;
+    }
+
+    buf = grub_malloc(file->size + 1);
+    if (!buf)
+    {
+        grub_printf("Failed to malloc memory %lu.\n", (ulong)(file->size + 1));
+        goto end;
+    }
+    
+    buf[file->size] = 0;
+    grub_file_read(file, buf, file->size);
+
+    json = vtoy_json_create();
+    if (!json)
+    {
+        grub_printf("Failed to create json\n");
+        goto end;
+    }
+
+    ret = vtoy_json_parse(json, buf);
+    if (ret)
+    {
+        grub_printf("Syntax error detected in ventoy.json, please check it.\n");
+        goto end;
+    }
+
+    for (node = json->pstChild; node; node = node->pstNext)
+    {
+        if (grub_strcmp(node->pcName, args[1]) == 0)
+        {
+            break;
+        }
+    }
+
+    if (!node)
+    {
+        grub_printf("%s is NOT found in ventoy.json\n", args[1]);
+        goto end;
+    }
+
+    for (i = 0; i < (int)ARRAY_SIZE(g_plugin_entries); i++)
+    {
+        if (grub_strcmp(g_plugin_entries[i].key, args[1]) == 0)
+        {
+            if (g_plugin_entries[i].checkfunc)
+            {
+                ret = g_plugin_entries[i].checkfunc(node, args[2]);                
+            }
+            break;
+        }
+    }
+    
+end:
+    check_free(file, grub_file_close);
+    check_free(json, vtoy_json_destroy);
+    grub_check_free(buf);
+
+    return 0;
+}
+

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

@@ -0,0 +1,243 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2007  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_FILE_HEADER
+#define GRUB_FILE_HEADER	1
+
+#include <grub/types.h>
+#include <grub/err.h>
+#include <grub/device.h>
+#include <grub/fs.h>
+#include <grub/disk.h>
+
+enum grub_file_type
+  {
+    GRUB_FILE_TYPE_NONE = 0,
+    /* GRUB module to be loaded.  */
+    GRUB_FILE_TYPE_GRUB_MODULE,
+    /* Loopback file to be represented as disk.  */
+    GRUB_FILE_TYPE_LOOPBACK,
+    /* Linux kernel to be loaded.  */
+    GRUB_FILE_TYPE_LINUX_KERNEL,
+    /* Linux initrd.  */
+    GRUB_FILE_TYPE_LINUX_INITRD,
+
+    /* Multiboot kernel.  */
+    GRUB_FILE_TYPE_MULTIBOOT_KERNEL,
+    /* Multiboot module.  */
+    GRUB_FILE_TYPE_MULTIBOOT_MODULE,
+
+    /* Xen hypervisor - used on ARM only. */
+    GRUB_FILE_TYPE_XEN_HYPERVISOR,
+    /* Xen module - used on ARM only. */
+    GRUB_FILE_TYPE_XEN_MODULE,
+
+    GRUB_FILE_TYPE_BSD_KERNEL,
+    GRUB_FILE_TYPE_FREEBSD_ENV,
+    GRUB_FILE_TYPE_FREEBSD_MODULE,
+    GRUB_FILE_TYPE_FREEBSD_MODULE_ELF,
+    GRUB_FILE_TYPE_NETBSD_MODULE,
+    GRUB_FILE_TYPE_OPENBSD_RAMDISK,
+
+    GRUB_FILE_TYPE_XNU_INFO_PLIST,
+    GRUB_FILE_TYPE_XNU_MKEXT,
+    GRUB_FILE_TYPE_XNU_KEXT,
+    GRUB_FILE_TYPE_XNU_KERNEL,
+    GRUB_FILE_TYPE_XNU_RAMDISK,
+    GRUB_FILE_TYPE_XNU_HIBERNATE_IMAGE,
+    GRUB_FILE_XNU_DEVPROP,
+
+    GRUB_FILE_TYPE_PLAN9_KERNEL,
+
+    GRUB_FILE_TYPE_NTLDR,
+    GRUB_FILE_TYPE_TRUECRYPT,
+    GRUB_FILE_TYPE_FREEDOS,
+    GRUB_FILE_TYPE_PXECHAINLOADER,
+    GRUB_FILE_TYPE_PCCHAINLOADER,
+
+    GRUB_FILE_TYPE_COREBOOT_CHAINLOADER,
+
+    GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE,
+
+    /* File holding signature.  */
+    GRUB_FILE_TYPE_SIGNATURE,
+    /* File holding public key to verify signature once.  */
+    GRUB_FILE_TYPE_PUBLIC_KEY,
+    /* File holding public key to add to trused keys.  */
+    GRUB_FILE_TYPE_PUBLIC_KEY_TRUST,
+    /* File of which we intend to print a blocklist to the user.  */
+    GRUB_FILE_TYPE_PRINT_BLOCKLIST,
+    /* File we intend to use for test loading or testing speed.  */
+    GRUB_FILE_TYPE_TESTLOAD,
+    /* File we open only to get its size. E.g. in ls output.  */
+    GRUB_FILE_TYPE_GET_SIZE,
+    /* Font file.  */
+    GRUB_FILE_TYPE_FONT,
+    /* File holding encryption key for encrypted ZFS.  */
+    GRUB_FILE_TYPE_ZFS_ENCRYPTION_KEY,
+    /* File we open n grub-fstest.  */
+    GRUB_FILE_TYPE_FSTEST,
+    /* File we open n grub-mount.  */
+    GRUB_FILE_TYPE_MOUNT,
+    /* File which we attempt to identify the type of.  */
+    GRUB_FILE_TYPE_FILE_ID,
+    /* File holding ACPI table.  */
+    GRUB_FILE_TYPE_ACPI_TABLE,
+    /* File holding Device Tree.  */
+    GRUB_FILE_TYPE_DEVICE_TREE_IMAGE,
+    /* File we intend show to user.  */
+    GRUB_FILE_TYPE_CAT,
+    GRUB_FILE_TYPE_HEXCAT,
+    /* One of pair of files we intend to compare.  */
+    GRUB_FILE_TYPE_CMP,
+    /* List of hashes for hashsum.  */
+    GRUB_FILE_TYPE_HASHLIST,
+    /* File hashed by hashsum.  */
+    GRUB_FILE_TYPE_TO_HASH,
+    /* Keyboard layout.  */
+    GRUB_FILE_TYPE_KEYBOARD_LAYOUT,
+    /* Picture file.  */
+    GRUB_FILE_TYPE_PIXMAP,
+    /* *.lst shipped by GRUB.  */
+    GRUB_FILE_TYPE_GRUB_MODULE_LIST,
+    /* config file.  */
+    GRUB_FILE_TYPE_CONFIG,
+    GRUB_FILE_TYPE_THEME,
+    GRUB_FILE_TYPE_GETTEXT_CATALOG,
+    GRUB_FILE_TYPE_FS_SEARCH,
+    GRUB_FILE_TYPE_AUDIO,
+    GRUB_FILE_TYPE_VBE_DUMP,
+
+    GRUB_FILE_TYPE_LOADENV,
+    GRUB_FILE_TYPE_SAVEENV,
+
+    GRUB_FILE_TYPE_VERIFY_SIGNATURE,
+
+    GRUB_FILE_TYPE_MASK = 0xffff,
+
+    /* --skip-sig is specified.  */
+    GRUB_FILE_TYPE_SKIP_SIGNATURE = 0x10000,
+    GRUB_FILE_TYPE_NO_DECOMPRESS = 0x20000
+  };
+
+/* File description.  */
+struct grub_file
+{
+  /* File name.  */
+  char *name;
+
+  /* The underlying device.  */
+  grub_device_t device;
+
+  /* The underlying filesystem.  */
+  grub_fs_t fs;
+
+  /* The current offset.  */
+  grub_off_t offset;
+  grub_off_t progress_offset;
+
+  /* Progress info. */
+  grub_uint64_t last_progress_time;
+  grub_off_t last_progress_offset;
+  grub_uint64_t estimated_speed;
+
+  /* The file size.  */
+  grub_off_t size;
+
+  /* If file is not easily seekable. Should be set by underlying layer.  */
+  int not_easily_seekable;
+
+  /* Filesystem-specific data.  */
+  void *data;
+
+  /* This is called when a sector is read. Used only for a disk device.  */
+  grub_disk_read_hook_t read_hook;
+
+  /* Caller-specific data passed to the read hook.  */
+  void *read_hook_data;
+};
+typedef struct grub_file *grub_file_t;
+
+extern grub_disk_read_hook_t EXPORT_VAR(grub_file_progress_hook);
+
+/* Filters with lower ID are executed first.  */
+typedef enum grub_file_filter_id
+  {
+    GRUB_FILE_FILTER_VERIFY,
+    GRUB_FILE_FILTER_GZIO,
+    GRUB_FILE_FILTER_XZIO,
+    GRUB_FILE_FILTER_LZOPIO,
+    GRUB_FILE_FILTER_MAX,
+    GRUB_FILE_FILTER_COMPRESSION_FIRST = GRUB_FILE_FILTER_GZIO,
+    GRUB_FILE_FILTER_COMPRESSION_LAST = GRUB_FILE_FILTER_LZOPIO,
+  } grub_file_filter_id_t;
+
+typedef grub_file_t (*grub_file_filter_t) (grub_file_t in, enum grub_file_type type);
+
+extern grub_file_filter_t EXPORT_VAR(grub_file_filters)[GRUB_FILE_FILTER_MAX];
+
+static inline void
+grub_file_filter_register (grub_file_filter_id_t id, grub_file_filter_t filter)
+{
+  grub_file_filters[id] = filter;
+}
+
+static inline void
+grub_file_filter_unregister (grub_file_filter_id_t id)
+{
+  grub_file_filters[id] = 0;
+}
+
+/* Get a device name from NAME.  */
+char *EXPORT_FUNC(grub_file_get_device_name) (const char *name);
+
+int EXPORT_FUNC(ventoy_check_file_exist) (const char * fmt, ...);
+grub_file_t EXPORT_FUNC(grub_file_open) (const char *name, enum grub_file_type type);
+grub_ssize_t EXPORT_FUNC(grub_file_read) (grub_file_t file, void *buf,
+					  grub_size_t len);
+grub_off_t EXPORT_FUNC(grub_file_seek) (grub_file_t file, grub_off_t offset);
+grub_err_t EXPORT_FUNC(grub_file_close) (grub_file_t file);
+
+/* Return value of grub_file_size() in case file size is unknown. */
+#define GRUB_FILE_SIZE_UNKNOWN	 0xffffffffffffffffULL
+
+static inline grub_off_t
+grub_file_size (const grub_file_t file)
+{
+  return file->size;
+}
+
+static inline grub_off_t
+grub_file_tell (const grub_file_t file)
+{
+  return file->offset;
+}
+
+static inline int
+grub_file_seekable (const grub_file_t file)
+{
+  return !file->not_easily_seekable;
+}
+
+grub_file_t
+grub_file_offset_open (grub_file_t parent, enum grub_file_type type,
+		       grub_off_t start, grub_off_t size);
+void
+grub_file_offset_close (grub_file_t file);
+
+#endif /* ! GRUB_FILE_HEADER */

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

@@ -109,6 +109,9 @@ typedef struct ventoy_os_param
      *
      * vtoy_reserved[0]: vtoy_break_level
      * vtoy_reserved[1]: vtoy_debug_level
+     * vtoy_reserved[2]: vtoy_chain_type     0:Linux    1:Windows
+     * vtoy_reserved[3]: vtoy_iso_format     0:iso9660  1:udf
+     * vtoy_reserved[4]: vtoy_windows_cd_prompt
      *
      */
     grub_uint8_t   vtoy_reserved[32];    // Internal use by ventoy
@@ -227,6 +230,7 @@ typedef struct ventoy_grub_param
 
 int grub_ext_get_file_chunk(grub_uint64_t part_start, grub_file_t file, ventoy_img_chunk_list *chunk_list);
 int grub_fat_get_file_chunk(grub_uint64_t part_start, grub_file_t file, ventoy_img_chunk_list *chunk_list);
+void grub_iso9660_set_nojoliet(int nojoliet);
 grub_uint64_t grub_iso9660_get_last_read_pos(grub_file_t file);
 grub_uint64_t grub_iso9660_get_last_file_dirent_pos(grub_file_t file);
 grub_uint64_t grub_udf_get_file_offset(grub_file_t file);

GRUB2/MOD_SRC/grub-2.04/install.sh

@@ -12,14 +12,15 @@ make install
 PATH=$PATH:$VT_DIR/GRUB2/INSTALL/bin/:$VT_DIR/GRUB2/INSTALL/sbin/
 
 net_modules_legacy="net tftp http"
-all_modules_legacy="date drivemap blocklist 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_msdos fat exfat ntfs loopback gzio normal  udf gfxmenu gfxterm gfxterm_background gfxterm_menu"
+all_modules_legacy="date drivemap blocklist 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"
 
 net_modules_uefi="efinet net tftp http"
-all_modules_uefi="blocklist ventoy test ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux relocator jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop efi_uga video_bochs video_cirrus video video_fb gfxterm_background gfxterm_menu"
+all_modules_uefi="blocklist ventoy test search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux relocator jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop efi_uga video_bochs video_cirrus video video_fb gfxterm_background gfxterm_menu"
 
+all_extra_modules="elf macho offsetio regexp file"
 
 if [ "$1" = "uefi" ]; then
-    all_modules="$net_modules_uefi $all_modules_uefi"
+    all_modules="$net_modules_uefi $all_modules_uefi $all_extra_modules"
     grub-mkimage -v --directory "$VT_DIR/GRUB2/INSTALL/lib/grub/x86_64-efi" --prefix '(,msdos2)/grub' --output "$VT_DIR/INSTALL/EFI/BOOT/grubx64_real.efi"  --format 'x86_64-efi' --compression 'auto'  $all_modules_uefi 'fat' 'part_msdos'
 else
     all_modules="$net_modules_legacy $all_modules_legacy"
@@ -38,6 +39,11 @@ else
     rm -f $VT_DIR/GRUB2/NBP/core.0
     cp -a $VT_DIR/GRUB2/PXE/grub2/i386-pc/core.0    $VT_DIR/GRUB2/NBP/core.0  || exit 1
     
+    for md in $all_extra_modules; do
+        rm -f $VT_DIR/INSTALL/grub/i386-pc/${md}.mod
+        cp -a $VT_DIR/GRUB2/INSTALL/lib/grub/i386-pc/${md}.mod  $VT_DIR/INSTALL/grub/i386-pc/
+    done
+    
     rm -f $VT_DIR/INSTALL/grub/i386-pc/boot.img
     cp -a $VT_DIR/GRUB2/INSTALL/lib/grub/i386-pc/boot.img  $VT_DIR/INSTALL/grub/i386-pc/boot.img   || exit 1
 fi

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

@@ -19,19 +19,25 @@
 
 . /ventoy/hook/ventoy-hook-lib.sh
 
+if is_ventoy_hook_finished; then
+    exit 0
+fi
+
 vtlog "####### $0 $* ########"
 
 VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
 
-while ! [ -e /dev/null ]; do
+wait_for_usb_disk_ready
-    echo 'xxxxxxxxxx'
-    echo 'xxxxxxxxxx' > /dev/console
-    sleep 1
-done
 
-vtlog "... start inotifyd listen $vtHook ..."
+vtdiskname=$(get_ventoy_disk_name)
-$BUSYBOX_PATH/nohup $VTOY_PATH/tool/inotifyd  $VTOY_PATH/hook/guix/ventoy-disk.sh  /dev:n  2>&-  & 
+if [ "$vtdiskname" = "unknown" ]; then
+    vtlog "ventoy disk not found"
+    PATH=$VTPATH_OLD
+    exit 0
+fi
 
+ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace"
 
 PATH=$VTPATH_OLD
 
+set_ventoy_hook_finish

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

@@ -0,0 +1,23 @@
+#!/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/>.
+# 
+#************************************************************************************
+
+. $VTOY_PATH/hook/ventoy-os-lib.sh
+
+$VTOY_PATH/hook/adelie/disk-hook.sh &
+

IMG/cpio/ventoy/hook/alt/udev_disk_hook.sh

@@ -32,13 +32,14 @@ fi
 
 # 
 # We do a trick for ATL series here.
-# Use /dev/loop7 and wapper it as a cdrom with bind mount.
+# Use /dev/vtCheatLoop and wapper it as a cdrom with bind mount.
-# Then the installer will accept /dev/loop7 as the install medium.
+# Then the installer will accept /dev/vtCheatLoop as the install medium.
 #
-ventoy_copy_device_mapper  /dev/loop7
+vtCheatLoop=loop6
-$BUSYBOX_PATH/mkdir -p /tmp/loop7/device/
+ventoy_copy_device_mapper  /dev/$vtCheatLoop
-echo 5 > /tmp/loop7/device/type
+$BUSYBOX_PATH/mkdir -p /tmp/$vtCheatLoop/device/
-$BUSYBOX_PATH/mount --bind /tmp/loop7 /sys/block/loop7 >> $VTLOG 2>&1
+echo 5 > /tmp/$vtCheatLoop/device/type
+$BUSYBOX_PATH/mount --bind /tmp/$vtCheatLoop /sys/block/$vtCheatLoop >> $VTLOG 2>&1
 
 
 # OK finish

IMG/cpio/ventoy/hook/arch/ovios-disk.sh

@@ -0,0 +1,50 @@
+#!/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
+
+wait_for_usb_disk_ready
+
+vtdiskname=$(get_ventoy_disk_name)
+if [ "$vtdiskname" = "unknown" ]; then
+    vtlog "ventoy disk not found"
+    PATH=$VTPATH_OLD
+    exit 0
+fi
+
+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/')
+blkdev_num_mknod=$($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 blkdev_num_mknod=$blkdev_num_mknod vtDM=$vtDM"
+
+if [ -b /dev/$vtDM ]; then
+    vtlog "dev already exist ..."
+else
+    vtlog "mknode dev ..."
+    mknod -m 660 /dev/$vtDM  b  $blkdev_num_mknod
+fi
+
+PATH=$VTPATH_OLD

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

@@ -26,6 +26,14 @@ if $GREP -q '^"$mount_handler"' /init; then
     if [ -f /hooks/archiso ]; then
         $SED  '/while ! poll_device "${dev}"/a\    if /ventoy/busybox/sh /ventoy/hook/arch/ventoy-timeout.sh ${dev}; then break; fi'   -i /hooks/archiso
     fi
+elif $GREP -q '^KEEP_SEARCHING' /init; then
+    echo 'KEEP_SEARCHING found ...' >> $VTLOG
+    $SED "/^KEEP_SEARCHING/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/arch/ovios-disk.sh " -i /init
+    
+    $BUSYBOX_PATH/mkdir -p /dev    
+    $BUSYBOX_PATH/mkdir -p /sys
+    $BUSYBOX_PATH/mount -t sysfs sys /sys
+    
 else
     # some archlinux initramfs doesn't contain device-mapper udev rules file
     ARCH_UDEV_DIR=$(ventoy_get_udev_conf_dir)

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

@@ -19,4 +19,10 @@
 
 . $VTOY_PATH/hook/ventoy-os-lib.sh
 
-$SED "/find_and_mount_installer *$/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/clear/disk-hook.sh" -i  /init
+if $GREP -q find_and_mount_installer /init; then
+    echo "find_and_mount_installer" >> $VTLOG
+    $SED "/find_and_mount_installer *$/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/clear/disk-hook.sh" -i  /init
+else
+    echo "find_installer" >> $VTLOG
+    $SED "/\$.*find_installer/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/clear/disk-hook.sh" -i  /init
+fi

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

@@ -32,4 +32,5 @@ if [ "$vtdiskname" = "unknown" ]; then
     exit 0
 fi
 
+vtlog "${vtdiskname#/dev/}2 found..."
 $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/udev_disk_hook.sh "${vtdiskname#/dev/}2"

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

@@ -21,6 +21,8 @@
 
 ventoy_os_install_dmsetup() {
 
+    vtlog "ventoy_os_install_dmsetup $1 ..."
+
     vt_usb_disk=$1
 
     # dump iso file location

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

@@ -19,13 +19,11 @@
 
 . $VTOY_PATH/hook/ventoy-os-lib.sh
 
-if [ -d /etc/udev/rules.d ] || [ -d /lib/udev/rules.d ]; then    
+if $GREP -q kaspersky /proc/version; then
+    $SED "/sysresccd_stage1_normal[^(]*$/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/gentoo/disk_hook.sh"  -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"
 else
-    if $GREP -q kaspersky /proc/version; then
+    $SED "/mdev *-s/a\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/gentoo/disk_hook.sh"  -i /init    
-        $SED "/sysresccd_stage1_normal[^(]*$/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/gentoo/disk_hook.sh"  -i /init
-    else
-        $SED "/mdev *-s/a\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/gentoo/disk_hook.sh"  -i /init
-    fi
 fi

IMG/cpio/ventoy/hook/guix/ventoy-before-init.sh

@@ -0,0 +1,26 @@
+#!/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/>.
+# 
+#************************************************************************************
+
+. $VTOY_PATH/hook/ventoy-os-lib.sh
+
+$BUSYBOX_PATH/mkdir /dev
+$BUSYBOX_PATH/mknod -m 0660 /dev/null c 1 3
+
+$BUSYBOX_PATH/sh $VTOY_PATH/hook/guix/ventoy-disk.sh &
+

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

@@ -19,24 +19,32 @@
 
 . /ventoy/hook/ventoy-hook-lib.sh
 
-if is_ventoy_hook_finished; then
+vtlog "######### $0 $* ############"
-    exit 0
-fi
-
-vtlog "##### INOTIFYD: $2/$3 is created ..."
 
 VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
 
-if is_inotify_ventoy_part $3; then
+wait_for_usb_disk_ready
-    vtlog "find ventoy partition ..."
-    $BUSYBOX_PATH/sh $VTOY_PATH/hook/default/udev_disk_hook.sh $3
-    
-    blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
-    vtDM=$(ventoy_find_dm_id ${blkdev_num})
 
-    vtlog "This is $vtDM ..."
+vtdiskname=$(get_ventoy_disk_name)
+if [ "$vtdiskname" = "unknown" ]; then
+    vtlog "ventoy disk not found"
+    PATH=$VTPATH_OLD
+    exit 0
+fi
 
-    set_ventoy_hook_finish
+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/')
+blkdev_num_mknod=$($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 blkdev_num_mknod=$blkdev_num_mknod vtDM=$vtDM"
+
+if [ -b /dev/$vtDM ]; then
+    vtlog "dev already exist ..."
+else
+    vtlog "mknode dev ..."
+    mknod -m 660 /dev/$vtDM  b  $blkdev_num_mknod
 fi
 
 PATH=$VTPATH_OLD

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

@@ -18,8 +18,3 @@
 #************************************************************************************
 
 . $VTOY_PATH/hook/ventoy-os-lib.sh
-
-$BUSYBOX_PATH/mkdir /dev
-$BUSYBOX_PATH/mknode -m 0666 /dev/null c 1 3
-
-$BUSYBOX_PATH/nohup $VTOY_PATH/hook/guix/ventoy-waitdev.sh &

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

@@ -0,0 +1,70 @@
+#!/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
+
+ventoy_os_install_dmsetup_by_unsquashfs() {
+    vtlog "ventoy_os_install_dmsetup_by_unsquashfs $*"
+    
+    vtKerVer=$(uname -r)
+    vtKoPo=$(ventoy_get_module_postfix)
+    vtlog "vtKerVer=$vtKerVer vtKoPo=$vtKoPo"
+
+    vtoydm -i -f $VTOY_PATH/ventoy_image_map -d $1 > $VTOY_PATH/iso_file_list
+
+    vtline=$(grep '[-][-] .*kernel.xzm '  $VTOY_PATH/iso_file_list)    
+    sector=$(echo $vtline | awk '{print $(NF-1)}')
+    length=$(echo $vtline | awk '{print $NF}')
+    
+    vtlog "vtline=$vtline  sector=$sector  length=$length"
+    
+    vtoydm -e -f $VTOY_PATH/ventoy_image_map -d $1 -s $sector -l $length -o $VTOY_PATH/kernel.xzm
+    mkdir -p $VTOY_PATH/sqfs  
+    mount $VTOY_PATH/kernel.xzm  $VTOY_PATH/sqfs
+
+    dmModPath="/lib/modules/$vtKerVer/kernel/drivers/md/dm-mod.$vtKoPo"    
+    
+    if [ -e $VTOY_PATH/sqfs${dmModPath} ]; then
+        vtlog "success $VTOY_PATH/sqfs${dmModPath}"
+        insmod $VTOY_PATH/sqfs${dmModPath}
+    else
+        vterr "failed $VTOY_PATH/sqfs${dmModPath}"
+        false
+    fi
+    
+    umount $VTOY_PATH/sqfs
+    rm -f $VTOY_PATH/kernel.xzm
+}
+
+wait_for_usb_disk_ready
+
+vtdiskname=$(get_ventoy_disk_name)
+if [ "$vtdiskname" = "unknown" ]; then
+    vtlog "ventoy disk not found"
+    PATH=$VTPATH_OLD
+    exit 0
+fi
+
+ventoy_os_install_dmsetup_by_unsquashfs $vtdiskname
+
+ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace"
+
+PATH=$VTPATH_OLD

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

@@ -0,0 +1,22 @@
+#!/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/>.
+# 
+#************************************************************************************
+
+. $VTOY_PATH/hook/ventoy-os-lib.sh
+
+$SED '/^ *search [^(]*$/i\    /ventoy/busybox/sh  /ventoy/hook/kiosk/ventoy-disk.sh'  -i /init

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

@@ -1,7 +1,29 @@
 #!/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/>.
+# 
+#************************************************************************************
 
 . $VTOY_PATH/hook/ventoy-os-lib.sh
 
-ventoy_systemd_udevd_work_around
+#ventoy_systemd_udevd_work_around
+#ventoy_add_udev_rule "$VTOY_PATH/hook/mageia/udev_disk_hook.sh %k noreplace"
+
+ventoy_set_inotify_script  mageia/ventoy-inotifyd-hook.sh
+$BUSYBOX_PATH/cp -a $VTOY_PATH/hook/mageia/ventoy-inotifyd-start.sh /lib/dracut/hooks/pre-udev/99-ventoy-inotifyd-start.sh
+
+
 
-ventoy_add_udev_rule "$VTOY_PATH/hook/mageia/udev_disk_hook.sh %k noreplace"

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

@@ -0,0 +1,69 @@
+#!/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
+
+if is_ventoy_hook_finished; then
+    exit 0
+fi
+
+vtlog "##### INOTIFYD: $2/$3 is created ..."
+
+VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
+
+if is_inotify_ventoy_part $3; then
+
+    vtlog "find ventoy partition ..."
+    $BUSYBOX_PATH/sh $VTOY_PATH/hook/default/udev_disk_hook.sh $3 noreplace
+    
+    blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
+    vtDM=$(ventoy_find_dm_id ${blkdev_num})   
+    vtLABEL=$($BUSYBOX_PATH/blkid /dev/$vtDM | $AWK '{print $2}' | $SED 's/.*"\(.*\)".*/\1/')
+    
+    vtlog "blkdev_num=$blkdev_num  vtDM=$vtDM  label $vtLABEL ..."
+   
+    if [ -n "$vtLABEL" ]; then
+        $BUSYBOX_PATH/mkdir -p /dev/disk/by-label/
+        ln -s /dev/$vtDM /dev/disk/by-label/$vtLABEL
+    fi
+    
+    #
+    # cheatcode for mageia
+    #
+    # From mageia/soft/drakx/mdk-stage1 source code, we see that the stage1 binary will search 
+    # /tmp/syslog file to determin whether there is a DAC960 cdrom in the system.
+    # So we insert some string to /tmp/syslog file to cheat the stage1 program.
+    #
+    $BUSYBOX_PATH/mkdir -p /dev/rd
+    ventoy_copy_device_mapper "/dev/rd/ventoy"
+    echo 'ventoy cheatcode /dev/rd/ventoy:  model' >> /tmp/syslog
+
+    if [ -e /sbin/mgalive-root ]; then
+        vtlog "set mgalive-root ..."
+            
+        $BUSYBOX_PATH/cp -a $BUSYBOX_PATH/blkid /sbin/blkid
+        $BUSYBOX_PATH/mkdir -p /dev/mapper
+        ln -s /dev/$vtDM  /dev/mapper/ventoy     
+        /sbin/mgalive-root /dev/dm-0    
+    fi
+    
+    set_ventoy_hook_finish
+fi
+
+PATH=$VTPATH_OLD

IMG/cpio/ventoy/hook/mageia/ventoy-inotifyd-start.sh

@@ -19,22 +19,13 @@
 
 . /ventoy/hook/ventoy-hook-lib.sh
 
-if is_ventoy_hook_finished || not_ventoy_disk "${1:0:-1}"; then
+vtHook=$($CAT $VTOY_PATH/inotifyd-hook-script.txt)
-    exit 0
+
+vtdisk=$(get_ventoy_disk_name)
+if [ "$vtdisk" = "unknown" ]; then
+    vtlog "... start inotifyd listen $vtHook ..."
+    $BUSYBOX_PATH/nohup $VTOY_PATH/tool/inotifyd $vtHook  /dev:n  2>&-  & 
+else
+    vtlog "... $vtdisk already exist ..."
+    $BUSYBOX_PATH/sh $vtHook n /dev "${vtdisk#/dev/}2"
 fi
-
-ventoy_udev_disk_common_hook $*
-
-#
-# cheatcode for mageia
-#
-# From mageia/soft/drakx/mdk-stage1 source code, we see that the stage1 binary will search 
-# /tmp/syslog file to determin whether there is a DAC960 cdrom in the system.
-# So we insert some string to /tmp/syslog file to cheat the stage1 program.
-#
-$BUSYBOX_PATH/mkdir -p /dev/rd
-ventoy_copy_device_mapper "/dev/rd/ventoy"
-echo 'ventoy cheatcode /dev/rd/ventoy:  model' >> /tmp/syslog
-
-# OK finish
-set_ventoy_hook_finish

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

@@ -19,6 +19,8 @@
 
 . /ventoy/hook/ventoy-hook-lib.sh
 
+vtCheatLoop=loop6
+
 ventoy_os_install_dmsetup() {
     vtlog "ventoy_os_install_dmsetup $1"
     
@@ -50,9 +52,9 @@ ventoy_os_install_dmsetup() {
 
 
 if is_ventoy_hook_finished || not_ventoy_disk "${1:0:-1}"; then
-    # /dev/loop7 come first
+    # /dev/vtCheatLoop come first
-    if [ "$1" = "loop7" ] && [ -b $VTOY_DM_PATH ]; then
+    if [ "$1" = "$vtCheatLoop" ] && [ -b $VTOY_DM_PATH ]; then
-        ventoy_copy_device_mapper  /dev/loop7
+        ventoy_copy_device_mapper  /dev/$vtCheatLoop
     fi
     exit 0
 fi
@@ -64,7 +66,7 @@ fi
 
 
 #some distro add there repo file to /etc/anaconda.repos.d/ which will cause error during installation
-$BUSYBOX_PATH/nohup $VTOY_PATH/tool/inotifyd $VTOY_PATH/hook/rhel6/anaconda-repo-listen.sh /etc/anaconda.repos.d:n &  
+#$BUSYBOX_PATH/nohup $VTOY_PATH/tool/inotifyd $VTOY_PATH/hook/rhel6/anaconda-repo-listen.sh /etc/anaconda.repos.d:n &  
 
 ventoy_udev_disk_common_hook $* "noreplace"
 
@@ -72,14 +74,14 @@ $BUSYBOX_PATH/mount $VTOY_DM_PATH /mnt/ventoy
 
 # 
 # We do a trick for rhel6 series here.
-# Use /dev/loop7 and wapper it as a removable cdrom with bind mount.
+# Use /dev/$vtCheatLoop and wapper it as a removable cdrom with bind mount.
-# Then the anaconda installer will accept /dev/loop7 as the install medium.
+# Then the anaconda installer will accept /dev/$vtCheatLoop as the install medium.
 #
-ventoy_copy_device_mapper  /dev/loop7
+ventoy_copy_device_mapper  /dev/$vtCheatLoop
 
-$BUSYBOX_PATH/cp -a /sys/devices/virtual/block/loop7 /tmp/ >> $VTLOG 2>&1
+$BUSYBOX_PATH/cp -a /sys/devices/virtual/block/$vtCheatLoop /tmp/ >> $VTLOG 2>&1
-echo 19 > /tmp/loop7/capability
+echo 19 > /tmp/$vtCheatLoop/capability
-$BUSYBOX_PATH/mount --bind /tmp/loop7 /sys/block/loop7 >> $VTLOG 2>&1
+$BUSYBOX_PATH/mount --bind /tmp/$vtCheatLoop /sys/block/$vtCheatLoop >> $VTLOG 2>&1
 
 # OK finish
 set_ventoy_hook_finish

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

@@ -22,6 +22,7 @@
 $BUSYBOX_PATH/mkdir -p /etc/anaconda.repos.d  /mnt/ventoy
 ventoy_print_yum_repo "ventoy" "file:///mnt/ventoy" > /etc/anaconda.repos.d/ventoy.repo
 
-
 ventoy_add_udev_rule "$VTOY_PATH/hook/rhel6/udev_disk_hook.sh %k"
-ventoy_add_kernel_udev_rule "loop7" "$VTOY_PATH/hook/rhel6/udev_disk_hook.sh %k"
+
+#loop7 was used by loader
+ventoy_add_kernel_udev_rule "loop6" "$VTOY_PATH/hook/rhel6/udev_disk_hook.sh %k"

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

@@ -31,7 +31,13 @@ else
             VTKS="inst.ks=hd:/dev/dm-0:$vtRawKs"
             break
         fi
-    done    
+        
+        if echo $vtParam | $GREP -q '^ks=.*:/'; then
+            vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
+            VTKS="ks=hd:/dev/dm-0:$vtRawKs"
+            break
+        fi
+    done
 fi
 
 echo "VTKS=$VTKS" >> $VTLOG
@@ -44,8 +50,15 @@ fi
 
 ventoy_set_inotify_script  rhel7/ventoy-inotifyd-hook.sh
 
-$BUSYBOX_PATH/cp -a $VTOY_PATH/hook/rhel7/ventoy-inotifyd-start.sh /lib/dracut/hooks/pre-udev/01-ventoy-inotifyd-start.sh
+#Fedora
-$BUSYBOX_PATH/cp -a $VTOY_PATH/hook/rhel7/ventoy-timeout.sh /lib/dracut/hooks/initqueue/timeout/01-ventoy-timeout.sh
+if $BUSYBOX_PATH/which dmsquash-live-root > /dev/null; then
+    vtPriority=99
+else
+    vtPriority=01
+fi
+
+$BUSYBOX_PATH/cp -a $VTOY_PATH/hook/rhel7/ventoy-inotifyd-start.sh /lib/dracut/hooks/pre-udev/${vtPriority}-ventoy-inotifyd-start.sh
+$BUSYBOX_PATH/cp -a $VTOY_PATH/hook/rhel7/ventoy-timeout.sh /lib/dracut/hooks/initqueue/timeout/${vtPriority}-ventoy-timeout.sh
 
 # suppress write protected mount warning
 if [ -e /usr/sbin/anaconda-diskroot ]; then

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

@@ -28,6 +28,16 @@ vtlog "##### INOTIFYD: $2/$3 is created ..."
 VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
 
 if is_inotify_ventoy_part $3; then
+
+    vtGenRulFile='/etc/udev/rules.d/99-live-squash.rules'
+    if [ -e $vtGenRulFile ] && $GREP -q dmsquash $vtGenRulFile; then
+        vtScript=$($GREP -m1 'RUN.=' $vtGenRulFile | $AWK -F'RUN.=' '{print $2}' | $SED 's/"\(.*\)".*/\1/')
+        vtlog "vtScript=$vtScript"
+        $vtScript
+    else
+        vtlog "$vtGenRulFile not exist..."
+    fi
+
     vtlog "find ventoy partition ..."
     $BUSYBOX_PATH/sh $VTOY_PATH/hook/default/udev_disk_hook.sh $3 noreplace
     
@@ -41,9 +51,10 @@ if is_inotify_ventoy_part $3; then
         ventoy_swap_device /dev/dm-0 /dev/$vtDM
     fi
     
-    vtlog "set anaconda-diskroot ..."
+    if [ -e /sbin/anaconda-diskroot ]; then
-    /sbin/anaconda-diskroot /dev/dm-0    
+        vtlog "set anaconda-diskroot ..."
-    #/sbin/initqueue --settled --onetime --name anaconda-diskroot anaconda-diskroot  /dev/dm-0
+        /sbin/anaconda-diskroot /dev/dm-0    
+    fi
     
     set_ventoy_hook_finish
 fi

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

@@ -26,8 +26,9 @@ VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
 blkdev_num=$(dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
 vtDM=$(ventoy_find_dm_id ${blkdev_num})
 
-vtlog "diskroot $vtDM ..."
+if [ -e /sbin/anaconda-diskroot ]; then
-/sbin/anaconda-diskroot /dev/dm-0    
+    vtlog "set anaconda-diskroot ..."
-#/sbin/initqueue --settled --onetime --name anaconda-diskroot anaconda-diskroot  /dev/$vtDM
+    /sbin/anaconda-diskroot /dev/dm-0    
+fi
 
 PATH=$VTPATH_OLD

IMG/cpio/ventoy/init

@@ -51,7 +51,17 @@ fi
 #                                                                  #
 ####################################################################
 cd /
-rm -rf /init /linuxrc /sbin /dev/  /root
+rm -rf /init /linuxrc /dev/  /root
+
+vtSbinFileNum=$(ls -1 /sbin | wc -l)
+if [ $vtSbinFileNum -eq 1 ]; then
+    echo "remove whole sbin directory" >> $VTLOG
+    rm -rf /sbin
+else
+    echo "remove only sbin/init file" >> $VTLOG
+    ls -l /sbin >> $VTLOG
+    rm -f /sbin/init
+fi
 
 ventoy_is_initrd_ramdisk() {
     #As I known, PCLinuxOS use ramdisk

IMG/cpio/ventoy/ventoy.sh

@@ -87,6 +87,10 @@ ventoy_get_os_type() {
     elif $EGREP -q 'archlinux|ARCH' /proc/version; then
         echo 'arch'; return
     
+    # kiosk
+    elif $EGREP -q 'kiosk' /proc/version; then
+        echo 'kiosk'; return
+    
     # gentoo
     elif $EGREP -q '[Gg]entoo' /proc/version; then
         echo 'gentoo'; return
@@ -188,6 +192,10 @@ ventoy_get_os_type() {
         echo 'android'; return
     fi 
     
+    if $GREP -q 'adelielinux' /proc/version; then
+        echo 'adelie'; return
+    fi
+    
     echo "default"
 }
 
@@ -214,8 +222,6 @@ if [ "$VTOY_BREAK_LEVEL" = "03" ] || [ "$VTOY_BREAK_LEVEL" = "13" ]; then
     exec $BUSYBOX_PATH/sh
 fi
 
-
-
 ####################################################################
 #                                                                  #
 # Step 4 : Hand over to real init                                  #
@@ -232,7 +238,8 @@ if [ -f $VTOY_PATH/ventoy_persistent_map ]; then
 fi
 
 cd /
-unset VTOY_PATH VTLOG FIND GREP EGREP CAT AWK SED SLEEP HEAD
+
+unset VTLOG FIND GREP EGREP CAT AWK SED SLEEP HEAD
 
 for vtinit in $user_rdinit /init /sbin/init /linuxrc; do
     if [ -d /ventoy_rdroot ]; then
@@ -243,6 +250,9 @@ for vtinit in $user_rdinit /init /sbin/init /linuxrc; do
         fi
     else
         if [ -e "$vtinit" ];then
+            if [ -f "$VTOY_PATH/hook/$VTOS/ventoy-before-init.sh" ]; then
+                $BUSYBOX_PATH/sh "$VTOY_PATH/hook/$VTOS/ventoy-before-init.sh"
+            fi
             exec "$vtinit"
         fi
     fi

INSTALL/grub/debug.cfg

@@ -0,0 +1,66 @@
+submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json {
+    menuentry 'Check global control plugin configuration' {
+        set pager=1
+        vt_check_plugin_json $vt_plugin_path control $iso_path
+        
+        echo -e "\npress ENTER to exit ..."
+        read vtInputKey
+        unset pager
+    }
+    
+    menuentry 'Check theme plugin configuration' --class=debug_theme {
+        set pager=1
+        vt_check_plugin_json $vt_plugin_path theme $iso_path
+        
+        echo -e "\npress ENTER to exit ..."
+        read vtInputKey
+        unset pager
+    }
+    
+    menuentry 'Check auto install plugin configuration' --class=debug_autoinstall {
+        set pager=1
+        vt_check_plugin_json $vt_plugin_path auto_install $iso_path
+        
+        echo -e "\npress ENTER to exit ..."
+        read vtInputKey
+        unset pager
+    }
+    
+    menuentry 'Check persistence plugin configuration' --class=debug_persistence {
+        set pager=1
+        vt_check_plugin_json $vt_plugin_path persistence $iso_path
+        
+        echo -e "\n############### dump persistence ###############"
+        vt_dump_persistence
+        
+        echo -e "\npress ENTER to exit ..."
+        read vtInputKey
+        unset pager
+    }
+    
+    menuentry 'Check menu alias plugin configuration' --class=debug_menualias {
+        set pager=1
+        vt_check_plugin_json $vt_plugin_path menu_alias $iso_path
+        
+        echo -e "\npress ENTER to exit ..."
+        read vtInputKey
+        unset pager
+    }
+    
+    menuentry 'Check menu class plugin configuration' --class=debug_menuclass {
+        set pager=1
+        vt_check_plugin_json $vt_plugin_path menu_class $iso_path
+        
+        echo -e "\npress ENTER to exit ..."
+        read vtInputKey
+        unset pager
+    }
+    
+    menuentry 'Return to previous menu [Esc]' --class=vtoyret VTOY_RET {
+        echo 'Return ...'
+    }
+}
+
+menuentry 'Return to previous menu [Esc]' --class=vtoyret VTOY_RET {
+    echo 'Return ...'
+}

INSTALL/grub/grub.cfg

@@ -16,60 +16,91 @@
 # 
 #************************************************************************************
 
+function ventoy_pause {
+    if [ -n "${vtdebug_flag}" ]; then
+        echo "press Enter to continue ......"
+        read vtTmpPause
+    fi
+}
+
+function ventoy_debug_pause {
+    if [ -n "${vtdebug_flag}" ]; then
+        echo "press Enter to continue ......"
+        read vtTmpPause
+    fi
+}
+
+
 function ventoy_power {
-    configfile ($root)/grub/power.cfg
+    configfile $prefix/power.cfg
+}
+
+function ventoy_diagnosis {    
+    configfile $prefix/debug.cfg
+}
+
+function ventoy_localboot {    
+    configfile $prefix/localboot.cfg
 }
 
 function get_os_type {
-    set vtoy_os=Linux    
+    set vtoy_os=Linux
-    for file in "efi/microsoft" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com" "BOOT/etfsboot.com"; do
+    
-        if [ -e $1/$file ]; then
+    for file in "efi/microsoft/boot/bcd" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com" ; do        
+        if vt_file_exist_nocase (loop)/$file; then        
             set vtoy_os=Windows
             break
         fi
     done
-    
+
     if [ -n "${vtdebug_flag}" ]; then
         echo ISO is $vtoy_os
     fi
 }
 
-function vt_check_pe {
+function vt_check_compatible_pe {
-    unset VT_PE_SUPPORT
+    #Check for PE without external tools
-
     if [ -f $1/HBCD_PE.ini ]; then
-        set ventoy_compatible=YES
+        set ventoy_compatible=YES        
-        set VT_PE_SUPPORT=YES
-    elif [ -f $1/easyu.flg ]; then
-        set VT_PE_SUPPORT=YES
-    elif [ -f $1/USM.ICO ]; then
-        set VT_PE_SUPPORT=YES
-    elif [ -d $1/USM_TOOL ]; then
-        set VT_PE_SUPPORT=YES
     fi
 }
 
 function locate_initrd {
     vt_linux_locate_initrd 
 
-    if [ -n "${vtdebug_flag}" ]; then
+    if [ -n "${vtdebug_flag}" ]; then        
         vt_linux_dump_initrd
-        sleep 5
+        ventoy_debug_pause
     fi
 }
 
-function find_wim_file {
+function locate_wim {
-    unset ventoy_wim_file
+    vt_windows_locate_wim_patch (loop)
     
-    for file in "sources/boot.wim" "sources/BOOT.WIM" "Sources/Win10PEx64.WIM" "boot/BOOT.WIM" \
+    if [ -n "${vtdebug_flag}" ]; then
-                "winpe_x64.wim" "boot/10pex64.wim" "BOOT/USM1PE6L.WIM" "BOOT/USM1PE6F.WIM"; do
+        echo '###############################################'
-        if [ -e $1/$file ]; then
+        vt_dump_wim_patch
-            set ventoy_wim_file=$1/$file
+        echo '###############################################'
-            break
+        ventoy_debug_pause
-        fi
+    fi
-    done
 }
 
+function distro_specify_wim_patch {
+    if [ -d (loop)/h3pe ]; then
+        vt_windows_collect_wim_patch wim /BOOT/H3_10PE.WIM
+        vt_windows_collect_wim_patch wim /BOOT/H3_7PE.WIM
+        vt_windows_collect_wim_patch wim /BOOT/H3_8PE.WIM
+        vt_windows_collect_wim_patch wim /BOOT/H3_81PE.WIM
+    fi
+}
+
+function distro_specify_wim_patch_phase2 {
+    if [ -f (loop)/boot/boot.wim ]; then
+        vt_windows_collect_wim_patch wim /boot/boot.wim
+    fi
+}
+
+
 function distro_specify_initrd_file {
     if [ -e (loop)/boot/all.rdz ]; then
         vt_linux_specify_initrd_file /boot/all.rdz
@@ -121,38 +152,58 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /live/initrd.img
     elif [ -f (loop)/initrd.img ]; then 
         vt_linux_specify_initrd_file /initrd.img
-
+    elif [ -f (loop)/sysresccd/boot/x86_64/sysresccd.img ]; then 
+        vt_linux_specify_initrd_file /sysresccd/boot/x86_64/sysresccd.img
+    
     fi
 }
 
 function uefi_windows_menu_func {
     vt_windows_reset
-    
+
-    if [ "$ventoy_compatible" = "NO" ]; then        
+    if [ "$ventoy_compatible" = "NO" ]; then   
-        find_wim_file (loop)
+        
-        if [ -n "$ventoy_wim_file" ]; then
+        if [ "$ventoy_fs_probe" = "iso9660" ]; then
-            vt_windows_locate_wim $ventoy_wim_file
+            loopback -d loop
+            vt_iso9660_nojoliet 1            
+            loopback loop $1$2
         fi
+        
+        for file in "efi/microsoft/boot/bcd"; do
+            vt_windows_collect_wim_patch bcd (loop)/$file                
+        done
+
+        vt_windows_count_wim_patch vt_wim_cnt
+        if [ $vt_wim_cnt -eq 0 ]; then
+            distro_specify_wim_patch_phase2
+        fi
+        
+        ventoy_debug_pause        
+        locate_wim
     fi
+
+    vt_windows_chain_data ${1}${chosen_path}    
+    ventoy_debug_pause
     
-    vt_windows_chain_data ${1}${chosen_path}
-
-    if [ -n "${vtdebug_flag}" ]; then
-        sleep 5
-    fi
-
     if [ -n "$vtoy_chain_mem_addr" ]; then
         terminal_output  console       
         chainloader ${vtoy_path}/ventoy_x64.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
         echo "chain empty failed"
-        sleep 5
+        ventoy_pause
     fi
 }
 
 function uefi_linux_menu_func {
     if [ "$ventoy_compatible" = "NO" ]; then    
+        
+        if [ "$ventoy_fs_probe" = "udf" ]; then
+            loopback -d loop            
+            set ventoy_fs_probe=iso9660
+            loopback loop $1$2
+        fi
+        
         vt_load_cpio  ${vtoy_path}/ventoy.cpio   $2 $1
 
         vt_linux_clear_initrd
@@ -166,20 +217,14 @@ function uefi_linux_menu_func {
                 fi
             done
         fi
-        
+
         # special process for special distros
         if [ -d (loop)/loader/entries ]; then
-            set LoadIsoEfiDriver=on
             vt_linux_parse_initrd_grub  dir  (loop)/loader/entries/
         elif [ -d (loop)/boot/grub ]; then
             vt_linux_parse_initrd_grub  dir  (loop)/boot/grub/
         fi
         
-        if [ -e (loop)/syslinux/alt0/full.cz ]; then
-            set LoadIsoEfiDriver=on
-            set FirstTryBootFile='@EFI@BOOT@grubx64.efi'
-        fi
-        
         distro_specify_initrd_file
         
         vt_linux_initrd_count vtcount
@@ -194,6 +239,24 @@ function uefi_linux_menu_func {
         fi
         
         locate_initrd
+        
+        if [ -d (loop)/loader/entries ]; then
+            vt_linux_get_main_initrd_index vtindex
+            
+            if [ -d (loop)/arch ]; then
+                if [ -f (loop)/arch/boot/x86_64/archiso.img ]; then
+                    vt_add_replace_file $vtindex "EFI\\archiso\\archiso.img"
+                elif [ -f (loop)/boot/initramfs_x86_64.img ]; then
+                    vt_add_replace_file $vtindex "boot\\initramfs_x86_64.img"
+                fi
+            elif [ -f (loop)/EFI/BOOT/initrd.gz ]; then
+                vt_add_replace_file $vtindex "EFI\\BOOT\\initrd.gz"
+            fi
+        elif [ -e (loop)/syslinux/alt0/full.cz ]; then
+            vt_add_replace_file 0 "EFI\\BOOT\\full.cz"            
+            set FirstTryBootFile='@EFI@BOOT@grubx64.efi'
+        fi
+        
     fi
     
     vt_linux_chain_data ${1}${chosen_path}
@@ -204,7 +267,7 @@ function uefi_linux_menu_func {
         boot
     else
         echo "chain empty failed"
-        sleep 5
+        ventoy_pause
     fi
 }
 
@@ -232,6 +295,7 @@ function uefi_iso_menu_func {
         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660
+        vt_iso9660_nojoliet 0
     fi
 
     loopback loop ${1}${chosen_path}
@@ -257,13 +321,7 @@ function uefi_iso_menu_func {
     vt_img_sector ${1}${chosen_path}
     
     if [ "$vtoy_os" = "Windows" ]; then
-        vt_check_pe (loop)        
+        vt_check_compatible_pe (loop)        
-        if [ "$VT_PE_SUPPORT" != "YES" ]; then
-            if [ "$ventoy_fs_probe" = "iso9660" ]; then        
-                set ventoy_compatible=YES
-            fi
-        fi
-    
         uefi_windows_menu_func  $1 ${chosen_path}
     else
         uefi_linux_menu_func  $1 ${chosen_path}
@@ -281,38 +339,58 @@ function uefi_iso_memdisk {
     terminal_output  console
     chainloader ${vtoy_path}/ventoy_x64.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size}
     boot
+    
+    terminal_output  gfxterm
 }
 
 
 function legacy_windows_menu_func {
     vt_windows_reset
     
-    if [ "$ventoy_compatible" = "NO" ]; then                
+    if [ "$ventoy_compatible" = "NO" ]; then   
-        find_wim_file (loop)
+        
-        if [ -n "$ventoy_wim_file" ]; then
+        if [ "$ventoy_fs_probe" = "iso9660" ]; then
-            vt_windows_locate_wim $ventoy_wim_file
+            loopback -d loop
-        elif [ -n "${vtdebug_flag}" ]; then
+            vt_iso9660_nojoliet 1
-            echo No wim file found
+            loopback loop $1$2
         fi
+        
+        for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD"; do
+            vt_windows_collect_wim_patch bcd (loop)/$file                
+        done
+        
+        distro_specify_wim_patch
+
+        vt_windows_count_wim_patch vt_wim_cnt
+        if [ $vt_wim_cnt -eq 0 ]; then
+            distro_specify_wim_patch_phase2
+        fi
+        
+        ventoy_debug_pause        
+        locate_wim
     fi
-       
+
-    vt_windows_chain_data ${1}${chosen_path}
+    vt_windows_chain_data ${1}${chosen_path}    
-    
+    ventoy_debug_pause    
-    if [ -n "${vtdebug_flag}" ]; then
-        sleep 5
-    fi
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
         echo "chain empty failed"
-        sleep 5
+        ventoy_pause
     fi
 }
 
 function legacy_linux_menu_func {
     if [ "$ventoy_compatible" = "NO" ]; then
+
+        if [ "$ventoy_fs_probe" = "udf" ]; then
+            loopback -d loop
+            set ventoy_fs_probe=iso9660
+            loopback loop $1$2
+        fi
+    
         vt_load_cpio  $vtoy_path/ventoy.cpio  $2 $1
 
         vt_linux_clear_initrd
@@ -352,18 +430,15 @@ function legacy_linux_menu_func {
         locate_initrd
     fi
     
-    vt_linux_chain_data ${1}${chosen_path}
+    vt_linux_chain_data ${1}${chosen_path}    
-    
+    ventoy_debug_pause
-    if [ -n "${vtdebug_flag}" ]; then
-        sleep 5
-    fi
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
         echo "chain empty failed"
-        sleep 5
+        ventoy_pause
     fi
 }
 
@@ -381,12 +456,12 @@ function legacy_iso_menu_func {
         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660
-    fi   
+        vt_iso9660_nojoliet 0
-
+    fi
+    
     loopback loop ${1}${chosen_path}
-    
     get_os_type (loop)
-    
+
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat
@@ -399,13 +474,7 @@ function legacy_iso_menu_func {
     vt_img_sector ${1}${chosen_path}
 
     if [ "$vtoy_os" = "Windows" ]; then
-        vt_check_pe (loop)        
+        vt_check_compatible_pe (loop)        
-        if [ "$VT_PE_SUPPORT" != "YES" ]; then
-            if [ "$ventoy_fs_probe" = "iso9660" ]; then        
-                set ventoy_compatible=YES
-            fi
-        fi
-        
         legacy_windows_menu_func  $1 ${chosen_path}
     else
         legacy_linux_menu_func  $1 ${chosen_path}
@@ -437,19 +506,22 @@ function iso_common_menuentry {
     fi      
 }
 
-function iso_unsupport_menuentry {
+function common_unsupport_menuentry {
     echo -e "\n The name of the iso file could NOT contain space or non-ascii characters. \n"
+    echo -e " 文件名中不能有中文或空格 \n"
     echo -e "\n Will return to main menu after 10 seconds ...\n"
     sleep 10
 }
 
+function iso_unsupport_menuentry {
+    common_unsupport_menuentry
+}
 
 function wim_common_menuentry {
     vt_chosen_img_path chosen_path
-    vt_wim_chain_data ${iso_path}${chosen_path}    
+    vt_wim_chain_data ${iso_path}${chosen_path}
-    if [ -n "${vtdebug_flag}" ]; then
+    
-        sleep 5
+    ventoy_debug_pause    
-    fi
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         if [ "$grub_platform" = "pc" ]; then
@@ -457,18 +529,30 @@ function wim_common_menuentry {
         else
             terminal_output  console       
             chainloader ${vtoy_path}/ventoy_x64.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+            terminal_output  gfxterm
         fi
         boot
     else
         echo "chain empty failed"
-        sleep 5
+        ventoy_pause
     fi
 }
 
 function wim_unsupport_menuentry {
-    echo -e "\n The name of the wim file could NOT contain space or non-ascii characters. \n"
+    common_unsupport_menuentry
-    echo -e "\n Will return to main menu after 10 seconds ...\n"
+}
-    sleep 10
+
+function efi_common_menuentry {
+    vt_chosen_img_path chosen_path
+    
+    terminal_output  console    
+    chainloader ${iso_path}${chosen_path}
+    boot
+    terminal_output  gfxterm
+}
+
+function efi_unsupport_menuentry {
+    common_unsupport_menuentry
 }
 
 #############################################################
@@ -479,21 +563,20 @@ function wim_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.12"
+set VENTOY_VERSION="1.0.14"
 
 # Default menu display mode, you can change it as you want.
 #    0: List mode   
 #    1: TreeView mode
 set VTOY_DEFAULT_MENU_MODE=0
 
-#disable timeout
-unset timeout
-
 set VTOY_MEM_DISK_STR="[Memdisk]"
-set VTOY_ISO_RAW_STR="ISO RAW"
+set VTOY_ISO_RAW_STR="Compatible Mode"
 set VTOY_ISO_UEFI_DRV_STR="UEFI FS"
 
 set VTOY_F2_CMD="ventoy_power"
+set VTOY_F4_CMD="ventoy_localboot"
+set VTOY_F5_CMD="ventoy_diagnosis"
 
 if [ "$grub_platform" = "pc" ]; then
     set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION BIOS  www.ventoy.net"
@@ -504,7 +587,7 @@ fi
 vt_device $root  vtoy_dev
 
 if [ "$vtoy_dev" = "tftp" ]; then
-    set vtoy_path=($root)    
+    set vtoy_path=($root)
     for vtid in 0 1 2 3; do
         if [ -d (hd$vtid,2)/ventoy ]; then
             set iso_path=(hd$vtid,1)
@@ -512,19 +595,39 @@ if [ "$vtoy_dev" = "tftp" ]; then
             break
         fi
     done
+    loadfont ascii
+
+    if [ -f $iso_path/ventoy/ventoy.json ]; then
+       set vt_plugin_path=$iso_path
+    else
+        set vt_plugin_path=$prefix
+        vt_load_plugin $vt_plugin_path
+    fi
 else
-    set vtoy_path=($root)/ventoy    
+    if [ "$prefix" = "(ventoydisk)/grub" ]; then
+        set vtoy_path=(ventoydisk)/ventoy
+    else
+        set vtoy_path=($root)/ventoy
+    fi
+
     set iso_path=($vtoy_dev,1)
     set vtoy_efi_part=($vtoy_dev,2)
+    loadfont unicode
+    set vt_plugin_path=$iso_path
 fi
 
-loadfont ascii
 
 #Load Plugin
 if [ -f $iso_path/ventoy/ventoy.json ]; then
    vt_load_plugin $iso_path
 fi
 
+if [ -n "$VTOY_MENU_TIMEOUT" ]; then
+    set timeout=$VTOY_MENU_TIMEOUT
+else
+    unset timeout
+fi
+
 if [ -f $iso_path/ventoy/ventoy_wimboot.img ]; then
     vt_load_wimboot $iso_path/ventoy/ventoy_wimboot.img
 elif [ -f $vtoy_efi_part/ventoy/ventoy_wimboot.img ]; then
@@ -534,10 +637,10 @@ fi
 
 if [ $VTOY_DEFAULT_MENU_MODE -eq 0 ]; then
     set VTOY_F3_CMD="vt_dynamic_menu 1 1"
-    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:TreeView"
+    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:TreeView  F4:Localboot  F5:Debug"
 else
     set VTOY_F3_CMD="vt_dynamic_menu 1 0"
-    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:ListView"
+    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:ListView  F4:Localboot  F5:Debug"
 fi
 
 
@@ -553,7 +656,11 @@ else
     set theme=$prefix/themes/ventoy/theme.txt
 fi
 
-terminal_output  gfxterm
+if [ "$vtoy_display_mode" = "CLI" ]; then
+    terminal_output  console
+else
+    terminal_output  gfxterm
+fi
 
 #colect all image files (iso files)
 set ventoy_img_count=0

INSTALL/grub/localboot.cfg

@@ -0,0 +1,65 @@
+
+if [ "$grub_platform" = "pc" ]; then
+    menuentry 'Search and boot Windows' --class=boot_windows {    
+        if search -n -s -f /bootmgr; then
+            ntldr /bootmgr
+        elif search -n -s -f /ntldr; then
+            ntldr /ntldr
+        else
+            echo "Windows NOT found ..."
+        fi        
+    }
+    
+    menuentry 'Search and boot Grub4dos' --class=boot_g4d {
+        if search -n -s -f /grldr; then
+            ntldr /grldr
+        else
+            echo "Grub4dos NOT found ..."
+        fi        
+    }
+    
+    menuentry 'Boot the 1st local disk' --class=boot_disk {
+        set root=(hd0,1)
+        chainloader +1
+        boot
+    }
+    
+    menuentry 'Boot the 2nd local disk' --class=boot_disk {
+        set root=(hd1,1)
+        chainloader +1
+        boot
+    }
+    
+    menuentry 'Boot the 3rd local disk' --class=boot_disk {
+        set root=(hd2,1)
+        chainloader +1
+        boot
+    }
+    
+else
+
+    menuentry 'Search and boot Windows' --class=boot_windows {    
+        if search -n -s -f /EFI/Microsoft/Boot/bootmgfw.efi; then
+            terminal_output  console
+            chainloader /EFI/Microsoft/Boot/bootmgfw.efi
+            boot
+        else
+            echo "Windows NOT found ..."
+        fi        
+    }
+    
+    menuentry 'Search and boot BOOTX64.EFI' --class=boot_uefi {    
+        if search -n -s -f /efi/boot/bootx64.efi; then
+            terminal_output  console
+            chainloader /efi/boot/bootx64.efi
+            boot
+        else
+            echo "BOOTX64.EFI NOT found ..."
+        fi        
+    }
+
+fi
+
+menuentry 'Return to menu [Esc]' --class=vtoyret VTOY_RET {
+    echo 'Return ...'
+}

INSTALL/grub/power.cfg

@@ -1,15 +1,15 @@
-menuentry Reboot {
+menuentry Reboot --class=power_reboot {
     echo -e '\n\nSystem is rebooting ... \n'
     sleep 1
     reboot
 }
 
-menuentry Halt {
+menuentry Halt --class=power_halt {
     echo -e '\n\nSystem is halting ... \n'
     sleep 1
-    reboot
+    halt
 }
 
-menuentry 'Return to menu [Esc]' VTOY_RET {
+menuentry 'Return to menu [Esc]' --class=vtoyret VTOY_RET {
     echo 'Return ...'
 }

INSTALL/grub/themes/ventoy/theme.txt

@@ -1,9 +1,7 @@
 
 desktop-image: "background.png"
 title-text: " "
-title-font: "ascii"
 title-color: "#ffffff"
-message-font: "ascii"
 message-color: "#f2f2f2"
 
 terminal-box: "terminal_box_*.png"
@@ -16,14 +14,12 @@ terminal-box: "terminal_box_*.png"
 
   menu_pixmap_style = "menu_*.png"
 
-  item_font = "ascii"  
   item_color = "#ffffff"  
   item_height = 30
   
   item_spacing = 1
   item_padding = 1
 
-  selected_item_font = "ascii"
   selected_item_color= "#f2f2f2"
   selected_item_pixmap_style = "select_*.png"
 
@@ -38,12 +34,11 @@ terminal-box: "terminal_box_*.png"
   id = "__timeout__"
   text = "@TIMEOUT_NOTIFICATION_SHORT@"
 
-  left = 95%
+  left = 20%
-  width = 48
+  width = 60%
-  top = 95%
+  top = 85%
-  height = 48
 
-  text_color = "#f2f2f2"
+  text_color = "red"
   bar_style = "*"
   highlight_style = "*"
 }
@@ -67,8 +62,8 @@ terminal-box: "terminal_box_*.png"
 
 
 + hbox{ 
-    left = 90%
+    left = 30%
-    top = 30 
+    top = 95%-50
     width = 10%
     height = 25
     + label {text = "@VTOY_ISO_RAW@" color = "red" align = "left"} 

INSTALL/tool/VentoyWorker.sh

@@ -10,12 +10,13 @@ print_usage() {
     echo '   -I  force install ventoy to sdX (no matter installed or not)'
     echo ''
     echo '  OPTION: (optional)'
-    echo '   -s  enable secure boot support (default is disabled)'
+    echo '   -r SIZE_MB  preserve some space at the bottom of the disk (only for install)'
+    echo '   -s          enable secure boot support (default is disabled)'
     echo ''
     
 }
 
-
+RESERVE_SIZE_MB=0
 while [ -n "$1" ]; do
     if [ "$1" = "-i" ]; then
         MODE="install"
@@ -26,6 +27,10 @@ while [ -n "$1" ]; do
         MODE="update"
     elif [ "$1" = "-s" ]; then
         SECUREBOOT="YES"
+    elif [ "$1" = "-r" ]; then
+        RESERVE_SPACE="YES"
+        shift
+        RESERVE_SIZE_MB=$1
     else
         if ! [ -b "$1" ]; then
             vterr "$1 is NOT a valid device"
@@ -53,6 +58,15 @@ if [ -e /sys/class/block/${DISK#/dev/}/start ]; then
     exit 1
 fi
 
+if [ -n "$RESERVE_SPACE" ]; then
+    if echo $RESERVE_SIZE_MB | grep -q '^[0-9][0-9]*$'; then
+        vtdebug "User will reserve $RESERVE_SIZE_MB MB disk space"
+    else
+        vterr "$RESERVE_SIZE_MB is invalid for reserved space"
+        exit 1
+    fi
+fi
+
 if dd if="$DISK" of=/dev/null bs=1 count=1 >/dev/null 2>&1; then
     vtdebug "root permission check ok ..."
 else
@@ -61,7 +75,7 @@ else
     exit 1
 fi
 
-vtdebug "MODE=$MODE FORCE=$FORCE"
+vtdebug "MODE=$MODE FORCE=$FORCE RESERVE_SPACE=$RESERVE_SPACE RESERVE_SIZE_MB=$RESERVE_SIZE_MB"
 
 if ! check_tool_work_ok; then
     vterr "Some tools can not run in current system. Please check log.txt for detail."
@@ -124,12 +138,28 @@ if [ "$MODE" = "install" ]; then
         exit 1
     fi
 
+    if [ -n "$RESERVE_SPACE" ]; then
+        sum_size_mb=$(expr $RESERVE_SIZE_MB + $VENTOY_PART_SIZE_MB)
+        reserve_sector_num=$(expr $sum_size_mb \* 2048)
+        
+        if [ $disk_sector_num -le $reserve_sector_num ]; then
+            vterr "Can't reserve $RESERVE_SIZE_MB MB space from $DISK"
+            exit 1
+        fi
+    fi
+
+
     #Print disk info
     echo "Disk : $DISK"
     parted -s $DISK p 2>&1 | grep Model
     echo "Size : $disk_size_gb GB"
     echo ''
 
+    if [ -n "$RESERVE_SPACE" ]; then
+        echo "You will reserve $RESERVE_SIZE_MB MB disk space "
+    fi
+    echo ''
+
     vtwarn "Attention:"
     vtwarn "You will install Ventoy to $DISK."
     vtwarn "All the data on the disk $DISK will be lost!!!"
@@ -162,7 +192,7 @@ if [ "$MODE" = "install" ]; then
         exit 1
     fi
 
-    format_ventoy_disk $DISK $PARTTOOL
+    format_ventoy_disk $RESERVE_SIZE_MB $DISK $PARTTOOL
 
     # format part1
     if ventoy_is_linux64; then
@@ -278,8 +308,7 @@ else
     
     ./tool/xzcat ./boot/core.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=2047 seek=1  
 
-    disk_sector_num=$(cat /sys/block/${DISK#/dev/}/size) 
+    part2_start=$(cat /sys/class/block/${PART2#/dev/}/start) 
-    part2_start=$(expr $disk_sector_num - $VENTOY_SECTOR_NUM)
     ./tool/xzcat ./ventoy/ventoy.disk.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=$VENTOY_SECTOR_NUM seek=$part2_start
 
     sync

INSTALL/tool/ventoy_lib.sh

@@ -2,6 +2,7 @@
 
 #Ventoy partition 32MB
 VENTOY_PART_SIZE=33554432
+VENTOY_PART_SIZE_MB=32
 VENTOY_SECTOR_SIZE=512
 VENTOY_SECTOR_NUM=65536
 
@@ -185,18 +186,28 @@ get_disk_ventoy_version() {
 }
 
 format_ventoy_disk() {
-    DISK=$1
+    reserve_mb=$1
-    PARTTOOL=$2
+    DISK=$2
+    PARTTOOL=$3
     
     PART1=$(get_disk_part_name $DISK 1)
     PART2=$(get_disk_part_name $DISK 2)
     
     sector_num=$(cat /sys/block/${DISK#/dev/}/size)
     
-    part1_start_sector=2048
+    part1_start_sector=2048 
-    part1_end_sector=$(expr $sector_num - $VENTOY_SECTOR_NUM - 1)
+    
-    export part2_start_sector=$(expr $part1_end_sector + 1)
+    if [ $reserve_mb -gt 0 ]; then
-    part2_end_sector=$(expr $sector_num - 1)
+        reserve_sector_num=$(expr $reserve_mb \* 2048)
+        part1_end_sector=$(expr $sector_num - $reserve_sector_num - $VENTOY_SECTOR_NUM - 1)
+    else
+        part1_end_sector=$(expr $sector_num - $VENTOY_SECTOR_NUM - 1)
+    fi
+    
+    part2_start_sector=$(expr $part1_end_sector + 1)
+    part2_end_sector=$(expr $part2_start_sector + $VENTOY_SECTOR_NUM - 1)
+
+    export part2_start_sector
 
     vtdebug "part1_start_sector=$part1_start_sector  part1_end_sector=$part1_end_sector"
     vtdebug "part2_start_sector=$part2_start_sector  part2_end_sector=$part2_end_sector"
@@ -278,7 +289,7 @@ EOF
 
     echo "create efi fat fs $PART2 ..."
     for i in 0 1 2 3 4 5 6 7 8 9; do
-        if mkfs.vfat -F 16 -n EFI $PART2; then
+        if mkfs.vfat -F 16 -n VTOYEFI $PART2; then
             echo 'success'
             break
         else

IPXE/ipxe_mod_code/ipxe-3fe683e/src/arch/x86/core/ventoy_vdisk.c

@@ -33,6 +33,8 @@ ventoy_img_chunk *g_chunk;
 uint32_t g_img_chunk_num;
 ventoy_img_chunk *g_cur_chunk;
 uint32_t g_disk_sector_size;
+uint8_t *g_os_param_reserved;
+
 
 ventoy_override_chunk *g_override_chunk;
 uint32_t g_override_chunk_num;
@@ -42,6 +44,14 @@ uint32_t g_virt_chunk_num;
 
 ventoy_sector_flag g_sector_flag[128];
 
+#define VENTOY_ISO9660_SECTOR_OVERFLOW  2097152
+
+int     g_fixup_iso9660_secover_enable = 0;
+int     g_fixup_iso9660_secover_start  = 0;
+uint64  g_fixup_iso9660_secover_1st_secs = 0;
+uint64  g_fixup_iso9660_secover_cur_secs = 0;
+uint64  g_fixup_iso9660_secover_tot_secs = 0;
+
 static struct int13_disk_address __bss16 ( ventoy_address );
 #define ventoy_address __use_data16 ( ventoy_address )
 
@@ -195,6 +205,17 @@ static int ventoy_vdisk_read_real(uint64_t lba, unsigned int count, unsigned lon
                 memcpy((char *)databuffer, override_data + start - override_start, override_end - start);
             }
         }
+
+        if (g_fixup_iso9660_secover_enable && (!g_fixup_iso9660_secover_start) && 
+            g_override_chunk[i].override_size == sizeof(ventoy_iso9660_override))
+        {
+            ventoy_iso9660_override *dirent = (ventoy_iso9660_override *)override_data;
+            if (dirent->first_sector >= VENTOY_ISO9660_SECTOR_OVERFLOW)
+            {
+                g_fixup_iso9660_secover_start = 1;
+                g_fixup_iso9660_secover_cur_secs = 0;
+            }
+        }
     }
 
 end:
@@ -202,6 +223,59 @@ end:
     return 0;
 }
 
+uint64_t ventoy_fixup_iso9660_sector(uint64_t Lba, uint32_t secNum)
+{
+    uint32_t i = 0;
+
+    if (g_fixup_iso9660_secover_cur_secs > 0)
+    {
+        Lba += VENTOY_ISO9660_SECTOR_OVERFLOW;
+        g_fixup_iso9660_secover_cur_secs += secNum;
+        if (g_fixup_iso9660_secover_cur_secs >= g_fixup_iso9660_secover_tot_secs)
+        {
+            g_fixup_iso9660_secover_start = 0;
+            goto end;
+        }
+    }
+    else
+    {
+        ventoy_iso9660_override *dirent;
+        ventoy_override_chunk *pOverride;
+
+        for (i = 0, pOverride = g_override_chunk; i < g_override_chunk_num; i++, pOverride++)
+        {
+            dirent = (ventoy_iso9660_override *)pOverride->override_data;
+            if (Lba == dirent->first_sector)
+            {
+                g_fixup_iso9660_secover_start = 0;
+                goto end;
+            }
+        }
+
+        if (g_fixup_iso9660_secover_start)
+        {
+            for (i = 0, pOverride = g_override_chunk; i < g_override_chunk_num; i++, pOverride++)
+            {
+                dirent = (ventoy_iso9660_override *)pOverride->override_data;
+                if (Lba + VENTOY_ISO9660_SECTOR_OVERFLOW == dirent->first_sector)
+                {
+                    g_fixup_iso9660_secover_tot_secs = (dirent->size + 2047) / 2048;
+                    g_fixup_iso9660_secover_cur_secs = secNum;
+                    if (g_fixup_iso9660_secover_cur_secs >= g_fixup_iso9660_secover_tot_secs)
+                    {
+                        g_fixup_iso9660_secover_start = 0;
+                    }
+                    Lba += VENTOY_ISO9660_SECTOR_OVERFLOW;
+                    goto end;
+                }
+            }
+        }
+    }
+
+end:
+    return Lba;
+}
+
 int ventoy_vdisk_read(struct san_device *sandev, uint64_t lba, unsigned int count, unsigned long buffer)
 {
     uint32_t i, j;
@@ -223,6 +297,12 @@ int ventoy_vdisk_read(struct san_device *sandev, uint64_t lba, unsigned int coun
 
     ix86 = (struct i386_all_regs *)sandev->x86_regptr;
 
+    /* Workaround for SSTR PE loader error */
+    if (g_fixup_iso9660_secover_start)
+    {
+        lba = ventoy_fixup_iso9660_sector(lba, count);
+    }
+
     readend = (lba + count) * 2048;
     if (readend <= g_chain->real_img_size_in_bytes)
     {
@@ -384,6 +464,8 @@ static void ventoy_dump_chain(ventoy_chain_head *chain)
     printf("os_param->vtoy_img_size=<%llu>\n",    chain->os_param.vtoy_img_size);
     printf("os_param->vtoy_reserve[0]=<%u>\n",    vtoy_reserve[0]);
     printf("os_param->vtoy_reserve[1]=<%u>\n",    vtoy_reserve[1]);
+    printf("os_param->vtoy_reserve[2]=<%u>\n",    vtoy_reserve[2]);
+    printf("os_param->vtoy_reserve[3]=<%u>\n",    vtoy_reserve[3]);
     printf("os_param->vtoy_img_location_addr=<0x%llx>\n", chain->os_param.vtoy_img_location_addr);
     printf("os_param->vtoy_img_location_len=<%u>\n",   chain->os_param.vtoy_img_location_len);
     ventoy_debug_pause();
@@ -489,6 +571,14 @@ int ventoy_boot_vdisk(void *data)
     g_disk_sector_size = g_chain->disk_sector_size;
     g_cur_chunk = g_chunk;
 
+    g_os_param_reserved = (uint8_t *)(g_chain->os_param.vtoy_reserved);
+
+    /* Workaround for Windows & ISO9660 */
+    if (g_os_param_reserved[2] == 1 && g_os_param_reserved[3] == 0)
+    {
+        g_fixup_iso9660_secover_enable = 1;
+    }
+
     g_override_chunk = (ventoy_override_chunk *)((char *)g_chain + g_chain->override_chunk_offset);
     g_override_chunk_num = g_chain->override_chunk_num;
 

IPXE/ipxe_mod_code/ipxe-3fe683e/src/arch/x86/interface/pcbios/ventoy_int13.c

@@ -1057,6 +1057,28 @@ static __asmcall void int13 ( struct i386_all_regs *ix86 ) {
         return;
     }
 
+    if (VENTOY_BOOT_FIXBIN_DRIVE == bios_drive && INT13_READ_SECTORS == command)
+    {
+        /* read sector 0 0x80 */
+        if (ix86->regs.dh == 0 && (ix86->regs.cl & 0x3f) == 1 && ix86->regs.al == 1)
+        {
+            userptr_t buffer;
+            
+            buffer = real_to_user(ix86->segs.es, ix86->regs.bx);
+            if (buffer)
+            {
+                memset((void *)buffer, 0, 512);
+            }
+
+            ix86->regs.dl = 0x80;
+            ix86->regs.ah = 0;
+
+    		/* Set OF to indicate to wrapper not to chain this call */
+    		ix86->flags |= OF;
+            return;
+        }
+    }
+
     // drive swap
     if (g_drive_map1 >= 0x80 && g_drive_map2 >= 0x80)
     {

IPXE/ipxe_mod_code/ipxe-3fe683e/src/include/ipxe/sanboot.h

@@ -85,13 +85,14 @@ struct san_device {
 	struct list_head opened;
 	/** List of closed SAN paths */
 	struct list_head closed;
-	/** SAN paths */
-	struct san_path path[0];
 
     unsigned int exdrive;
     int int13_command;
     void *x86_regptr;
     uint8_t boot_catalog_sector[2048];
+
+	/** SAN paths */
+	struct san_path path[0];    
 };
 
 /** SAN device flags */

IPXE/ipxe_mod_code/ipxe-3fe683e/src/include/ventoy.h

@@ -80,6 +80,14 @@ typedef struct ventoy_os_param
     grub_uint8_t   reserved[31];
 }ventoy_os_param;
 
+typedef struct ventoy_iso9660_override
+{
+    uint32_t first_sector;
+    uint32_t first_sector_be;
+    uint32_t size;
+    uint32_t size_be;
+}ventoy_iso9660_override;
+
 #pragma pack()
 
 // compile assert to check that size of ventoy_os_param must be 512
@@ -162,6 +170,7 @@ typedef struct ventoy_sector_flag
 }ventoy_sector_flag;
 
 #define VENTOY_BIOS_FAKE_DRIVE  0xFE
+#define VENTOY_BOOT_FIXBIN_DRIVE  0xFD
 
 extern int g_debug;
 extern char *g_cmdline_copy;

README.md

@@ -53,3 +53,9 @@ Title | Link
 
 # FAQ
 See [https://www.ventoy.net/en/faq.html](https://www.ventoy.net/en/faq.html) for detail
+
+
+# Forum
+[https://forums.ventoy.net](https://forums.ventoy.net)
+
+

Ventoy2Disk/Ventoy2Disk/Language.h

@@ -51,12 +51,19 @@ typedef enum STR_ID
 	STR_MENU_OPTION,//19
 	STR_MENU_SECURE_BOOT,//20
 
+    STR_MENU_PART_CFG,//21
+    STR_BTN_OK,//22
+    STR_BTN_CANCEL,//23
+    STR_PRESERVE_SPACE,//24
+	STR_SPACE_VAL_INVALID,//25
+
 	STR_ID_MAX
 }STR_ID;
 
 extern BOOL g_SecureBoot;
 
 #define VTOY_MENU_SECURE_BOOT	  0xA000
+#define VTOY_MENU_PART_CFG        0xA001
 #define VTOY_MENU_LANGUAGE_BEGIN  0xB000
 
 

Ventoy2Disk/Ventoy2Disk/PhyDrive.c

@@ -304,7 +304,7 @@ static DWORD GetVentoyVolumeName(int PhyDrive, UINT32 StartSectorId, CHAR *NameB
 
     PartOffset = 512ULL * StartSectorId;
 
-    Log("GetVentoyVolumeName PhyDrive %d PartOffset:%llu", PhyDrive, (ULONGLONG)PartOffset);
+	Log("GetVentoyVolumeName PhyDrive %d SectorStart:%u PartOffset:%llu", PhyDrive, StartSectorId, (ULONGLONG)PartOffset);
 
     hVolume = FindFirstVolumeA(VolumeName, sizeof(VolumeName));
     if (hVolume == INVALID_HANDLE_VALUE)
@@ -798,7 +798,7 @@ static int VentoyFatDiskRead(uint32 Sector, uint8 *Buffer, uint32 SectorCount)
 }
 
 
-int GetVentoyVerInPhyDrive(const PHY_DRIVE_INFO *pDriveInfo, CHAR *VerBuf, size_t BufLen)
+int GetVentoyVerInPhyDrive(const PHY_DRIVE_INFO *pDriveInfo, MBR_HEAD *pMBR, CHAR *VerBuf, size_t BufLen)
 {
     int rc = 0;
     HANDLE hDrive;
@@ -810,7 +810,7 @@ int GetVentoyVerInPhyDrive(const PHY_DRIVE_INFO *pDriveInfo, CHAR *VerBuf, size_
     }
     
     g_FatPhyDrive = hDrive;
-    g_Part2StartSec = (pDriveInfo->SizeInBytes - VENTOY_EFI_PART_SIZE) / 512;
+	g_Part2StartSec = pMBR->PartTbl[1].StartSectorId;
 
     Log("Parse FAT fs...");
 
@@ -1033,8 +1033,9 @@ static int FormatPart2Fat(HANDLE hDrive, UINT64 StartSectorId)
     BOOL bRet;
     unsigned char *data = NULL;
     LARGE_INTEGER liCurrentPosition;
+	LARGE_INTEGER liNewPosition;
 
-    Log("FormatPart2Fat ...");
+	Log("FormatPart2Fat %llu...", StartSectorId);
 
     rc = ReadWholeFileToBuf(VENTOY_FILE_DISK_IMG, 0, (void **)&data, &len);
     if (rc)
@@ -1044,7 +1045,9 @@ static int FormatPart2Fat(HANDLE hDrive, UINT64 StartSectorId)
     }
 
     liCurrentPosition.QuadPart = StartSectorId * 512;
-    SetFilePointerEx(hDrive, liCurrentPosition, &liCurrentPosition, FILE_BEGIN);
+	SetFilePointerEx(hDrive, liCurrentPosition, &liNewPosition, FILE_BEGIN);
+
+	Log("Set file pointer: %llu  New pointer:%llu", liCurrentPosition.QuadPart, liNewPosition.QuadPart);
 
     memset(g_part_img_buf, 0, sizeof(g_part_img_buf));
 
@@ -1063,7 +1066,7 @@ static int FormatPart2Fat(HANDLE hDrive, UINT64 StartSectorId)
             for (i = 0; i < VENTOY_EFI_PART_SIZE / SIZE_1MB; i++)
             {
                 dwSize = 0;
-                bRet = WriteFile(hDrive, g_part_img_buf[0] + i * SIZE_1MB, SIZE_1MB, &dwSize, NULL);
+				bRet = WriteFile(hDrive, g_part_img_buf[0] + i * SIZE_1MB, SIZE_1MB, &dwSize, NULL);
                 Log("Write part data bRet:%u dwSize:%u code:%u", bRet, dwSize, LASTERR);
 
                 if (!bRet)
@@ -1425,11 +1428,10 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive)
     CHAR DriveName[] = "?:\\";
     CHAR DriveLetters[MAX_PATH] = { 0 };
     UINT32 StartSector;
+	UINT64 ReservedMB = 0;
     MBR_HEAD BootImg;
     MBR_HEAD MBR;
 
-    StartSector = (UINT32)(pPhyDrive->SizeInBytes / 512 - VENTOY_EFI_PART_SIZE / 512);
-
     Log("UpdateVentoy2PhyDrive PhyDrive%d <<%s %s %dGB>>",
         pPhyDrive->PhyDrive, pPhyDrive->VendorId, pPhyDrive->ProductId, 
         GetHumanReadableGBSize(pPhyDrive->SizeInBytes));
@@ -1446,8 +1448,15 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive)
     }
 
     // Read MBR
+	SetFilePointer(hDrive, 0, NULL, FILE_BEGIN);
     ReadFile(hDrive, &MBR, sizeof(MBR), &dwSize, NULL);
 
+	StartSector = MBR.PartTbl[1].StartSectorId;
+	Log("StartSector in PartTbl:%u", StartSector);
+
+	ReservedMB = (pPhyDrive->SizeInBytes / 512 - (StartSector + VENTOY_EFI_PART_SIZE / 512)) / 2048;
+	Log("Reserved Disk Space:%u MB", ReservedMB);
+
     GetLettersBelongPhyDrive(pPhyDrive->PhyDrive, DriveLetters, sizeof(DriveLetters));
 
     if (DriveLetters[0] == 0)

Ventoy2Disk/Ventoy2Disk/Utility.c

@@ -427,10 +427,12 @@ static int VentoyFillLocation(UINT64 DiskSizeInBytes, UINT32 StartSectorId, UINT
 int VentoyFillMBR(UINT64 DiskSizeBytes, MBR_HEAD *pMBR)
 {
     GUID Guid;
+	int ReservedValue;
     UINT32 DiskSignature;
     UINT32 DiskSectorCount;
     UINT32 PartSectorCount;
     UINT32 PartStartSector;
+	UINT32 ReservedSector;
 
     VentoyGetLocalBootImg(pMBR);
 
@@ -444,9 +446,21 @@ int VentoyFillMBR(UINT64 DiskSizeBytes, MBR_HEAD *pMBR)
 
     DiskSectorCount = (UINT32)(DiskSizeBytes / 512);
 
+	ReservedValue = GetReservedSpaceInMB();
+	if (ReservedValue <= 0)
+	{
+		ReservedSector = 0;
+	}
+	else
+	{
+		ReservedSector = (UINT32)(ReservedValue * 2048);
+	}
+
+	Log("ReservedSector: %u", ReservedSector);
+
     //Part1
     PartStartSector = VENTOY_PART1_START_SECTOR;
-    PartSectorCount = DiskSectorCount - VENTOY_EFI_PART_SIZE / 512 - PartStartSector;
+	PartSectorCount = DiskSectorCount - ReservedSector - VENTOY_EFI_PART_SIZE / 512 - PartStartSector;
     VentoyFillLocation(DiskSizeBytes, PartStartSector, PartSectorCount, pMBR->PartTbl);
 
     pMBR->PartTbl[0].Active = 0x80; // bootable

Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.c

@@ -70,7 +70,7 @@ int ParseCmdLineOption(LPSTR lpCmdLine)
     return 0;
 }
 
-static BOOL IsVentoyPhyDrive(int PhyDrive, UINT64 SizeBytes)
+static BOOL IsVentoyPhyDrive(int PhyDrive, UINT64 SizeBytes, MBR_HEAD *pMBR)
 {
     int i;
     BOOL bRet;
@@ -121,30 +121,24 @@ static BOOL IsVentoyPhyDrive(int PhyDrive, UINT64 SizeBytes)
         Log("PartTbl.EndCylinder = %u", MBR.PartTbl[i].EndCylinder);
     }
 
-    if (MBR.PartTbl[2].SectorCount > 0 || MBR.PartTbl[3].SectorCount > 0)
+
+    if (MBR.PartTbl[0].StartSectorId != 2048)
     {
-        Log("Part3 Part4 are not empty");
+        Log("Part1 not match %u", MBR.PartTbl[0].StartSectorId);
         return FALSE;
     }
 
-    PartStartSector = 2048;
+    PartStartSector = MBR.PartTbl[0].StartSectorId + MBR.PartTbl[0].SectorCount;
-    PartSectorCount = (UINT32)((SizeBytes - VENTOY_EFI_PART_SIZE - SIZE_1MB) / 512);
-
-    if (MBR.PartTbl[0].StartSectorId != PartStartSector ||
-        MBR.PartTbl[0].SectorCount != PartSectorCount)
-    {
-        Log("Part1 not match %u %u", PartStartSector, PartSectorCount);
-        return FALSE;
-    }
-
-    PartStartSector = (UINT32)((SizeBytes - VENTOY_EFI_PART_SIZE) / 512);
     PartSectorCount = VENTOY_EFI_PART_SIZE / 512;
 
     if (MBR.PartTbl[1].FsFlag != 0xEF ||
         MBR.PartTbl[1].StartSectorId != PartStartSector ||
         MBR.PartTbl[1].SectorCount != PartSectorCount)
     {
-        Log("Part2 not match %u %u", PartStartSector, PartSectorCount);
+        Log("Part2 not match [0x%x 0x%x] [%u %u] [%u %u]",
+            MBR.PartTbl[1].FsFlag, 0xEF,
+            MBR.PartTbl[1].StartSectorId, PartStartSector,
+            MBR.PartTbl[1].SectorCount, PartSectorCount);
         return FALSE;
     }
 
@@ -154,6 +148,7 @@ static BOOL IsVentoyPhyDrive(int PhyDrive, UINT64 SizeBytes)
         return FALSE;
     }
 
+	memcpy(pMBR, &MBR, sizeof(MBR_HEAD));
     Log("PhysicalDrive%d is ventoy disk", PhyDrive);
     return TRUE;
 }
@@ -167,6 +162,7 @@ static int FilterPhysicalDrive(PHY_DRIVE_INFO *pDriveList, DWORD DriveCount)
     int Id = 0;
     int LetterCount = 0;
     PHY_DRIVE_INFO *CurDrive;
+	MBR_HEAD MBR;
     int LogLetter[VENTOY_MAX_PHY_DRIVE];
     int PhyDriveId[VENTOY_MAX_PHY_DRIVE];
 
@@ -221,9 +217,9 @@ static int FilterPhysicalDrive(PHY_DRIVE_INFO *pDriveList, DWORD DriveCount)
             }
         }
 
-        if (IsVentoyPhyDrive(CurDrive->PhyDrive, CurDrive->SizeInBytes))
+		if (IsVentoyPhyDrive(CurDrive->PhyDrive, CurDrive->SizeInBytes, &MBR))
         {
-            GetVentoyVerInPhyDrive(CurDrive, CurDrive->VentoyVersion, sizeof(CurDrive->VentoyVersion));
+			GetVentoyVerInPhyDrive(CurDrive, &MBR, CurDrive->VentoyVersion, sizeof(CurDrive->VentoyVersion));
         }
     }
 

Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h

@@ -144,7 +144,7 @@ int GetRegDwordValue(HKEY Key, LPCSTR SubKey, LPCSTR ValueName, DWORD *pValue);
 int GetPhysicalDriveCount(void);
 int GetAllPhysicalDriveInfo(PHY_DRIVE_INFO *pDriveList, DWORD *pDriveCount);
 int GetPhyDriveByLogicalDrive(int DriveLetter);
-int GetVentoyVerInPhyDrive(const PHY_DRIVE_INFO *pDriveInfo, CHAR *VerBuf, size_t BufLen);
+int GetVentoyVerInPhyDrive(const PHY_DRIVE_INFO *pDriveInfo, MBR_HEAD *pMBR, CHAR *VerBuf, size_t BufLen);
 int Ventoy2DiskInit(void);
 int Ventoy2DiskDestroy(void);
 PHY_DRIVE_INFO * GetPhyDriveInfoById(int Id);
@@ -159,5 +159,7 @@ int INIT unxz(unsigned char *in, int in_size,
     unsigned char *out, int *in_used,
     void(*error)(char *x));
 void disk_io_set_param(HANDLE Handle, UINT64 SectorCount);
+INT_PTR CALLBACK PartDialogProc(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam);
+int GetReservedSpaceInMB(void);
 
 #endif

Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj

@@ -104,6 +104,7 @@
     <ClCompile Include="ff14\source\ffsystem.c" />
     <ClCompile Include="ff14\source\ffunicode.c" />
     <ClCompile Include="Language.c" />
+    <ClCompile Include="PartDialog.c" />
     <ClCompile Include="PhyDrive.c" />
     <ClCompile Include="Utility.c" />
     <ClCompile Include="Ventoy2Disk.c" />

Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj.filters

@@ -69,6 +69,9 @@
     <ClCompile Include="ff14\source\ffunicode.c">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="PartDialog.c">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Ventoy2Disk.h">

docker-compose.yml

@@ -0,0 +1,8 @@
+version: '2'
+
+services:
+  ventoy:
+    build: .
+    privileged: true
+    volumes:
+     - .:/ventoy

vtoyjump/vtoyjump/vtoyjump.c

@@ -492,13 +492,13 @@ static int VentoyFatDiskRead(uint32 Sector, uint8 *Buffer, uint32 SectorCount)
 
 static CHAR GetMountLogicalDrive(void)
 {
-	CHAR Letter = 'Z';
+	CHAR Letter = 'Y';
 	DWORD Drives;
-	DWORD Mask = 0x2000000;
+	DWORD Mask = 0x1000000;
 
 	Drives = GetLogicalDrives();
     Log("Drives=0x%x", Drives);
-
+    
 	while (Mask)
 	{
 		if ((Drives & Mask) == 0)
@@ -724,7 +724,7 @@ static int ProcessUnattendedInstallation(const char *script)
     {
         Letter = 'X';
     }
-
+    
     sprintf_s(CurDir, sizeof(CurDir), "%C:\\Autounattend.xml", Letter);
     Log("Copy file <%s> --> <%s>", script, CurDir);
     CopyFile(script, CurDir, FALSE);