1.1.10 release

This reverts commit d3b911d249.

BLOB_List.md

@@ -85,13 +85,14 @@
         <tr> <td>./INSTALL/tool/i386/V2DServer</td>
         <tr> <td>./INSTALL/tool/mips64el/V2DServer</td>
         <tr> <td>./INSTALL/tool/x86_64/V2DServer</td>
-        <tr> <td>./INSTALL/tool/aarch64/mkexfatfs</td> <td rowspan=8>build</td>    <td rowspan=8>Build Instructions:<br/>./DOC/BuildVentoyFromSource.txt 4.9<br/>./ExFAT/buidexfat.sh<br/>./ExFAT/buidexfat_aarch64.sh<br/>./ExFAT/buidlibfuse.sh<br/>./ExFAT/buidlibfuse_aarch64.sh<br/></td>    </tr>
+        <tr> <td>./INSTALL/tool/aarch64/mkexfatfs</td> <td rowspan=9>build</td>    <td rowspan=8>Build Instructions:<br/>./DOC/BuildVentoyFromSource.txt 4.9<br/>./ExFAT/buidexfat.sh<br/>./ExFAT/buidexfat_aarch64.sh<br/>./ExFAT/buidlibfuse.sh<br/>./ExFAT/buidlibfuse_aarch64.sh<br/></td>    </tr>
         <tr> <td>./INSTALL/tool/aarch64/mount.exfat-fuse</td>
         <tr> <td>./INSTALL/tool/i386/mkexfatfs</td>
         <tr> <td>./INSTALL/tool/i386/mount.exfat-fuse</td>
         <tr> <td>./INSTALL/tool/mips64el/mkexfatfs</td>
         <tr> <td>./INSTALL/tool/mips64el/mount.exfat-fuse</td>
         <tr> <td>./INSTALL/tool/x86_64/mkexfatfs</td>
+        <tr> <td>./INSTALL/tool/x86_64/mkexfatfs_static</td>
         <tr> <td>./INSTALL/tool/x86_64/mount.exfat-fuse</td>    
         <tr> <td>./INSTALL/tool/aarch64/vlnk</td> <td rowspan=4>build</td>    <td rowspan=4>Build Instructions:<br/>./Vlnk/build.sh</td>    </tr>
         <tr> <td>./INSTALL/tool/i386/vlnk</td>

DMPATCH/Makefile

@@ -1,7 +0,0 @@
-
-obj-m += dm_patch.o
-
-EXTRA_CFLAGS := -Wall
-
-dm_patch-objs := dmpatch.o
-

DMPATCH/Makefile_IBT

@@ -1,7 +0,0 @@
-
-obj-m += dm_patch_ibt.o
-
-EXTRA_CFLAGS := -Wall -DVTOY_IBT -fcf-protection=branch -mindirect-branch-register
-
-dm_patch_ibt-objs := dmpatch.o
-

DMPATCH/dmpatch.c

@@ -1,632 +0,0 @@
-/******************************************************************************
- * dmpatch.c  ---- patch for device-mapper
- *
- * Copyright (c) 2021, 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 <linux/init.h>
-#include <linux/module.h>
-#include <linux/kallsyms.h>
-#include <linux/mutex.h>
-#include <linux/mempool.h>
-#include <linux/delay.h>
-#include <linux/wait.h>
-#include <linux/slab.h>
-
-#define MAX_PATCH   4
-
-#define magic_sig 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF
-
-typedef int (*kprobe_reg_pf)(void *);
-typedef void (*kprobe_unreg_pf)(void *);
-typedef int (*printk_pf)(const char *fmt, ...);
-typedef int (*set_memory_attr_pf)(unsigned long addr, int numpages);
-
-#pragma pack(1)
-typedef struct ko_param
-{
-    unsigned char magic[16];
-    unsigned long struct_size;
-    unsigned long pgsize;
-    unsigned long printk_addr;
-    unsigned long ro_addr;
-    unsigned long rw_addr;
-    unsigned long reg_kprobe_addr;
-    unsigned long unreg_kprobe_addr;
-    unsigned long sym_get_addr;
-    unsigned long sym_get_size;
-    unsigned long sym_put_addr;
-    unsigned long sym_put_size;
-    unsigned long kv_major;
-    unsigned long ibt;
-    unsigned long kv_minor;
-    unsigned long blkdev_get_addr;
-    unsigned long blkdev_put_addr;
-    unsigned long bdev_open_addr;
-    unsigned long kv_subminor;
-    unsigned long bdev_file_open_addr;
-    unsigned long padding[1];
-}ko_param;
-
-#pragma pack()
-
-static printk_pf kprintf = NULL;
-static set_memory_attr_pf set_mem_ro = NULL;
-static set_memory_attr_pf set_mem_rw = NULL;
-static kprobe_reg_pf reg_kprobe = NULL;
-static kprobe_unreg_pf unreg_kprobe = NULL;
-
-static volatile ko_param g_ko_param = 
-{
-    { magic_sig },
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-#if defined(CONFIG_X86_64)
-#define PATCH_OP_POS1    3
-#define CODE_MATCH1(code, i) \
-    (code[i] == 0x40 && code[i + 1] == 0x80 && code[i + 2] == 0xce && code[i + 3] == 0x80)
-
-#define PATCH_OP_POS2    1
-#define CODE_MATCH2(code, i) \
-    (code[i] == 0x0C && code[i + 1] == 0x80 && code[i + 2] == 0x89 && code[i + 3] == 0xC6)
-    
-#define PATCH_OP_POS3    4
-#define CODE_MATCH3(code, i) \
-    (code[i] == 0x44 && code[i + 1] == 0x89 && code[i + 2] == 0xe8 && code[i + 3] == 0x0c && code[i + 4] == 0x80)
-
-
-
-
-
-#elif defined(CONFIG_X86_32)
-#define PATCH_OP_POS1    2
-#define CODE_MATCH1(code, i) \
-    (code[i] == 0x80 && code[i + 1] == 0xca && code[i + 2] == 0x80 && code[i + 3] == 0xe8)
-
-#define PATCH_OP_POS2    PATCH_OP_POS1
-#define CODE_MATCH2      CODE_MATCH1
-#define PATCH_OP_POS3    PATCH_OP_POS1
-#define CODE_MATCH3      CODE_MATCH1
-
-
-#else
-#error "unsupported arch"
-#endif
-
-#ifdef VTOY_IBT
-#ifdef CONFIG_X86_64
-/* Using 64-bit values saves one instruction clearing the high half of low */
-#define DECLARE_ARGS(val, low, high)	unsigned long low, high
-#define EAX_EDX_VAL(val, low, high)	((low) | (high) << 32)
-#define EAX_EDX_RET(val, low, high)	"=a" (low), "=d" (high)
-#else
-#define DECLARE_ARGS(val, low, high)	unsigned long long val
-#define EAX_EDX_VAL(val, low, high)	(val)
-#define EAX_EDX_RET(val, low, high)	"=A" (val)
-#endif
-
-#define	EX_TYPE_WRMSR			 8
-#define	EX_TYPE_RDMSR			 9
-#define MSR_IA32_S_CET			0x000006a2 /* kernel mode cet */
-#define CET_ENDBR_EN			(1ULL << 2)
-
-/* Exception table entry */
-#ifdef __ASSEMBLY__
-
-#define _ASM_EXTABLE_TYPE(from, to, type)			\
-	.pushsection "__ex_table","a" ;				\
-	.balign 4 ;						\
-	.long (from) - . ;					\
-	.long (to) - . ;					\
-	.long type ;						\
-	.popsection
-
-#else /* ! __ASSEMBLY__ */
-
-#define _ASM_EXTABLE_TYPE(from, to, type)			\
-	" .pushsection \"__ex_table\",\"a\"\n"			\
-	" .balign 4\n"						\
-	" .long (" #from ") - .\n"				\
-	" .long (" #to ") - .\n"				\
-	" .long " __stringify(type) " \n"			\
-	" .popsection\n"
-
-#endif /* __ASSEMBLY__ */
-#endif /* VTOY_IBT */
-
-
-
-
-
-
-#define vdebug(fmt, args...) if(kprintf) kprintf(KERN_ERR fmt, ##args)
-
-static unsigned int g_claim_ptr = 0;
-static unsigned char *g_get_patch[MAX_PATCH] = { NULL };
-static unsigned char *g_put_patch[MAX_PATCH] = { NULL };
-
-static int notrace dmpatch_kv_above(unsigned long Major, unsigned long Minor, unsigned long SubMinor)
-{
-    if (g_ko_param.kv_major != Major)
-    {
-        return (g_ko_param.kv_major > Major) ? 1 : 0;
-    }
-
-    if (g_ko_param.kv_minor != Minor)
-    {
-        return (g_ko_param.kv_minor > Minor) ? 1 : 0;
-    }
-
-    if (g_ko_param.kv_subminor != SubMinor)
-    {
-        return (g_ko_param.kv_subminor > SubMinor) ? 1 : 0;
-    }
-
-    return 1;
-}
-
-static void notrace dmpatch_restore_code(int bytes, unsigned char *opCode, unsigned int code)
-{
-    unsigned long align;
-
-    if (opCode)
-    {
-        align = (unsigned long)opCode / g_ko_param.pgsize * g_ko_param.pgsize;
-        set_mem_rw(align, 1);
-        if (bytes == 1)
-        {
-            *opCode = (unsigned char)code;            
-        }
-        else
-        {
-            *(unsigned int *)opCode = code;
-        }
-        set_mem_ro(align, 1);        
-    }
-}
-
-static int notrace dmpatch_replace_code
-(
-    int style,
-    unsigned long addr, 
-    unsigned long size, 
-    int expect, 
-    const char *desc, 
-    unsigned char **patch
-)
-{
-    int i = 0;
-    int cnt = 0;
-    unsigned long align;
-    unsigned char *opCode = (unsigned char *)addr;
-
-    vdebug("patch for %s style[%d] 0x%lx %d\n", desc, style, addr, (int)size);
-
-    for (i = 0; i < (int)size - 8; i++)
-    {
-        if (style == 1)
-        {
-            if (CODE_MATCH1(opCode, i) && cnt < MAX_PATCH)
-            {
-                patch[cnt] = opCode + i + PATCH_OP_POS1;
-                cnt++;
-            }
-        }
-        else if (style == 2)
-        {
-            if (CODE_MATCH2(opCode, i) && cnt < MAX_PATCH)
-            {
-                patch[cnt] = opCode + i + PATCH_OP_POS2;
-                cnt++;
-            }
-        }
-        else if (style == 3)
-        {
-            if (CODE_MATCH3(opCode, i) && cnt < MAX_PATCH)
-            {
-                patch[cnt] = opCode + i + PATCH_OP_POS3;
-                cnt++;
-            }
-        }
-    }
-
-
-
-
-
-    if (cnt != expect || cnt >= MAX_PATCH)
-    {
-        vdebug("patch error: cnt=%d expect=%d\n", cnt, expect);
-        return 1;
-    }
-
-
-    for (i = 0; i < cnt; i++)
-    {
-        opCode = patch[i];
-        align = (unsigned long)opCode / g_ko_param.pgsize * g_ko_param.pgsize;
-
-        set_mem_rw(align, 1);
-        *opCode = 0;
-        set_mem_ro(align, 1);
-    }
-
-    return 0;
-}
-
-static unsigned long notrace dmpatch_find_call_offset(unsigned long addr, unsigned long size, unsigned long func)
-{
-    unsigned long i = 0;
-    unsigned long dest;
-    unsigned char *opCode = NULL;
-    unsigned char aucOffset[8] = { 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF };
-
-    opCode = (unsigned char *)addr;
-    
-    for (i = 0; i + 4 < size; i++)
-    {
-        if (opCode[i] == 0xE8)
-        {
-            aucOffset[0] = opCode[i + 1];
-            aucOffset[1] = opCode[i + 2];
-            aucOffset[2] = opCode[i + 3];
-            aucOffset[3] = opCode[i + 4];
-
-            dest = addr + i + 5 + *(unsigned long *)aucOffset;
-            if (dest == func)
-            {
-                return i;
-            }
-        }
-    }
-
-    return 0;
-}
-
-static unsigned int notrace dmpatch_patch_claim_ptr(void)
-{
-    unsigned long i = 0;
-    unsigned long t = 0;
-    unsigned long offset1 = 0;
-    unsigned long offset2 = 0;
-    unsigned long align = 0;
-    unsigned char *opCode = NULL;
-
-    opCode = (unsigned char *)g_ko_param.sym_get_addr;
-    for (i = 0; i < 4; i++)
-    {
-        vdebug("%02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n",
-            opCode[i + 0], opCode[i + 1], opCode[i + 2], opCode[i + 3],
-            opCode[i + 4], opCode[i + 5], opCode[i + 6], opCode[i + 7],
-            opCode[i + 8], opCode[i + 9], opCode[i + 10], opCode[i + 11],
-            opCode[i + 12], opCode[i + 13], opCode[i + 14], opCode[i + 15]);
-    }
-
-    if (dmpatch_kv_above(6, 7, 0)) /* >= 6.7 kernel */
-    {
-        vdebug("Get addr: 0x%lx %lu open 0x%lx\n", g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_open_addr);
-        offset1 = dmpatch_find_call_offset(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_open_addr);
-        if (offset1 == 0)
-        {
-            vdebug("call bdev_open_addr Not found\n");
-
-            vdebug("Get addr: 0x%lx %lu file_open 0x%lx\n", g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_file_open_addr);
-            offset1 = dmpatch_find_call_offset(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_file_open_addr);
-            if (offset1 == 0)
-            {            
-                vdebug("call bdev_file_open_addr Not found\n");
-                return 1;
-            }
-        }
-    }
-    else
-    {
-        vdebug("Get addr: 0x%lx %lu 0x%lx\n", g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.blkdev_get_addr);
-        vdebug("Put addr: 0x%lx %lu 0x%lx\n", g_ko_param.sym_put_addr, g_ko_param.sym_put_size, g_ko_param.blkdev_put_addr);        
-
-        offset1 = dmpatch_find_call_offset(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.blkdev_get_addr);
-        offset2 = dmpatch_find_call_offset(g_ko_param.sym_put_addr, g_ko_param.sym_put_size, g_ko_param.blkdev_put_addr);
-        if (offset1 == 0 || offset2 == 0)
-        {
-            vdebug("call blkdev_get or blkdev_put Not found, %lu %lu\n", offset1, offset2);
-            return 1;
-        }
-    }
-
-    
-    vdebug("call addr1:0x%lx  call addr2:0x%lx\n", 
-        g_ko_param.sym_get_addr + offset1, 
-        g_ko_param.sym_put_addr + offset2);
-    
-    opCode = (unsigned char *)g_ko_param.sym_get_addr;
-    for (i = offset1 - 1, t = 0; (i > 0) && (t < 24); i--, t++)
-    {
-        /* rdx */
-        if (opCode[i] == 0x48 && opCode[i + 1] == 0xc7 && opCode[i + 2] == 0xc2)
-        {
-            g_claim_ptr = *(unsigned int *)(opCode + i + 3);
-            g_get_patch[0] = opCode + i + 3;
-            vdebug("claim_ptr(%08X) found at get addr 0x%lx\n", g_claim_ptr, g_ko_param.sym_get_addr + i + 3);
-            break;
-        }
-    }
-
-    if (g_claim_ptr == 0)
-    {
-        vdebug("Claim_ptr not found in get\n");
-        return 1;
-    }
-
-    
-    align = (unsigned long)g_get_patch[0] / g_ko_param.pgsize * g_ko_param.pgsize;
-    set_mem_rw(align, 1);
-    *(unsigned int *)(g_get_patch[0]) = 0;
-    set_mem_ro(align, 1);  
-
-
-    if (offset2 > 0)
-    {        
-        opCode = (unsigned char *)g_ko_param.sym_put_addr;
-        for (i = offset2 - 1, t = 0; (i > 0) && (t < 24); i--, t++)
-        {
-            /* rsi */
-            if (opCode[i] == 0x48 && opCode[i + 1] == 0xc7 && opCode[i + 2] == 0xc6)
-            {
-                if (*(unsigned int *)(opCode + i + 3) == g_claim_ptr)
-                {
-                    vdebug("claim_ptr found at put addr 0x%lx\n", g_ko_param.sym_put_addr + i + 3);
-                    g_put_patch[0] = opCode + i + 3;
-                    break;                
-                }
-            }
-        }    
-
-        if (g_put_patch[0] == 0)
-        {
-            vdebug("Claim_ptr not found in put\n");
-            return 1;
-        }
-        
-        align = (unsigned long)g_put_patch[0] / g_ko_param.pgsize * g_ko_param.pgsize;
-        set_mem_rw(align, 1);
-        *(unsigned int *)(g_put_patch[0]) = 0;
-        set_mem_ro(align, 1);   
-    }
-
-    return 0;
-}
-
-#ifdef VTOY_IBT
-static __always_inline unsigned long long dmpatch_rdmsr(unsigned int msr)
-{
-	DECLARE_ARGS(val, low, high);
-
-	asm volatile("1: rdmsr\n"
-		     "2:\n"
-		     _ASM_EXTABLE_TYPE(1b, 2b, EX_TYPE_RDMSR)
-		     : EAX_EDX_RET(val, low, high) : "c" (msr));
-
-	return EAX_EDX_VAL(val, low, high);
-}
-
-static __always_inline void dmpatch_wrmsr(unsigned int msr, u32 low, u32 high)
-{
-	asm volatile("1: wrmsr\n"
-		     "2:\n"
-		     _ASM_EXTABLE_TYPE(1b, 2b, EX_TYPE_WRMSR)
-		     : : "c" (msr), "a"(low), "d" (high) : "memory");
-}
-
-static u64 notrace dmpatch_ibt_save(void)
-{
-    u64 msr = 0;
-    u64 val = 0;
-
-    msr = dmpatch_rdmsr(MSR_IA32_S_CET);
-    val = msr & ~CET_ENDBR_EN;
-    dmpatch_wrmsr(MSR_IA32_S_CET, (u32)(val & 0xffffffffULL), (u32)(val >> 32));
-
-    return msr;
-}
-
-static void notrace dmpatch_ibt_restore(u64 save)
-{
-	u64 msr;
-
-    msr = dmpatch_rdmsr(MSR_IA32_S_CET);
-
-	msr &= ~CET_ENDBR_EN;
-	msr |= (save & CET_ENDBR_EN);
-
-    dmpatch_wrmsr(MSR_IA32_S_CET, (u32)(msr & 0xffffffffULL), (u32)(msr >> 32));
-}
-#else
-static u64 notrace dmpatch_ibt_save(void) { return 0; }
-static void notrace dmpatch_ibt_restore(u64 save) { (void)save; }
-#endif
-
-static int notrace dmpatch_process(unsigned long a, unsigned long b, unsigned long c)
-{
-    int r = 0;
-    int rc = 0;
-    unsigned long kv_major = 0;
-    unsigned long kv_minor = 0;
-    unsigned long kv_subminor = 0;
-
-    vdebug("dmpatch_process as KV %d.%d.%d ...\n", (int)a, (int)b, (int)c);
-
-    kv_major = g_ko_param.kv_major;
-    kv_minor = g_ko_param.kv_minor;
-    kv_subminor = g_ko_param.kv_subminor;
-
-    g_ko_param.kv_major = a;
-    g_ko_param.kv_minor = b;
-    g_ko_param.kv_subminor = c;
-    
-    if (dmpatch_kv_above(6, 5, 0)) /* >= kernel 6.5 */
-    {
-        vdebug("new interface patch dm_get_table_device...\n");
-        r = dmpatch_patch_claim_ptr();
-    }
-    else
-    {
-        r = dmpatch_replace_code(1, g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 2, "dm_get_table_device", g_get_patch);
-        if (r && g_ko_param.kv_major >= 5)
-        {
-            vdebug("new2 patch dm_get_table_device...\n");
-            r = dmpatch_replace_code(2, g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 1, "dm_get_table_device", g_get_patch);
-        }
-
-        if (r && g_ko_param.kv_major >= 5)
-        {
-            vdebug("new3 patch dm_get_table_device...\n");
-            r = dmpatch_replace_code(3, g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 1, "dm_get_table_device", g_get_patch);
-        }
-    }
-
-    if (r)
-    {
-        rc = -EFAULT;
-        goto out;
-    }
-    vdebug("patch dm_get_table_device success\n");
-
-    if (dmpatch_kv_above(6, 5, 0))
-    {
-        r = 0;
-    }
-    else
-    {
-        r = dmpatch_replace_code(1, g_ko_param.sym_put_addr, g_ko_param.sym_put_size, 1, "dm_put_table_device", g_put_patch);        
-        if (r)
-        {
-            rc = -EFAULT;
-            goto out;
-        }
-        vdebug("patch dm_put_table_device success\n");
-    }
-
-    vdebug("#####################################\n");
-    vdebug("######## dm patch success ###########\n");
-    vdebug("#####################################\n");
-
-out:
-
-    g_ko_param.kv_major = kv_major;
-    g_ko_param.kv_minor = kv_minor;
-    g_ko_param.kv_subminor = kv_subminor;
-
-	return rc;
-}
-
-static int notrace dmpatch_init(void)
-{
-    int rc = 0;
-    u64 msr = 0;
-    
-    if (g_ko_param.ibt == 0x8888)
-    {
-        msr = dmpatch_ibt_save();
-    }
-    
-    kprintf = (printk_pf)(g_ko_param.printk_addr); 
-
-    vdebug("dmpatch_init start pagesize=%lu kernel=%lu.%lu.%lu ...\n", 
-        g_ko_param.pgsize, g_ko_param.kv_major, g_ko_param.kv_minor, g_ko_param.kv_subminor);
-    
-    if (g_ko_param.struct_size != sizeof(ko_param))
-    {
-        vdebug("Invalid struct size %d %d\n", (int)g_ko_param.struct_size, (int)sizeof(ko_param));
-        return -EINVAL;
-    }
-    
-    if (g_ko_param.sym_get_addr == 0 || g_ko_param.sym_put_addr == 0 || 
-        g_ko_param.ro_addr == 0 || g_ko_param.rw_addr == 0)
-    {
-        return -EINVAL;
-    }
-
-    set_mem_ro = (set_memory_attr_pf)(g_ko_param.ro_addr);
-    set_mem_rw = (set_memory_attr_pf)(g_ko_param.rw_addr);
-    reg_kprobe = (kprobe_reg_pf)g_ko_param.reg_kprobe_addr;
-    unreg_kprobe = (kprobe_unreg_pf)g_ko_param.unreg_kprobe_addr;
-
-    rc = dmpatch_process(g_ko_param.kv_major, g_ko_param.kv_minor, g_ko_param.kv_subminor);
-    if (rc)
-    {
-        if (g_ko_param.kv_major >= 5)
-        {
-            rc = dmpatch_process(6, 5, 0);
-            if (rc)
-            {
-                rc = dmpatch_process(6, 7, 0);
-            }
-        }
-    }
-
-    if (g_ko_param.ibt == 0x8888)
-    {
-        dmpatch_ibt_restore(msr);
-    }
-
-    return rc;
-}
-
-static void notrace dmpatch_exit(void)
-{
-    int i = 0;
-    u64 msr;
-
-    if (g_ko_param.ibt == 0x8888)
-    {
-        msr = dmpatch_ibt_save();
-    }
-
-    if (g_claim_ptr)
-    {
-        dmpatch_restore_code(4, g_get_patch[0], g_claim_ptr);
-        if (g_put_patch[0])
-        {
-            dmpatch_restore_code(4, g_put_patch[0], g_claim_ptr);
-        }
-    }
-    else
-    {        
-        for (i = 0; i < MAX_PATCH; i++)
-        {
-            dmpatch_restore_code(1, g_get_patch[i], 0x80);
-            dmpatch_restore_code(1, g_put_patch[i], 0x80);
-        }
-    }
-
-    vdebug("dmpatch_exit success\n");
-
-    if (g_ko_param.ibt == 0x8888)
-    {
-        dmpatch_ibt_restore(msr);
-    }
-}
-
-module_init(dmpatch_init);
-module_exit(dmpatch_exit);
-
-
-MODULE_DESCRIPTION("dmpatch driver");
-MODULE_AUTHOR("longpanda <admin@ventoy.net>");
-MODULE_LICENSE("GPL");
-

DMPATCH/readme.txt

@@ -1,38 +0,0 @@
-1. install ubuntu 22.04  5.15.0-25
-2. apt-get install build-essential flex libncurses-dev linux-headers-generic linux-source libssl-dev bison yacc vim libelf-dev  ...... and so on
-3. cp /lib/modules/5.15.0-25-generic/build/Module.symvers ./
-4. /boot/config-5.15.0-25-generic as .config   make oldconfig
-5. make menuconfig 
-    1. close CONFIG_STACKPROTECTOR
-    2. close CONFIG_RETPOLINE
-    3. close CONFIG_UBSAN_BOUNDS
-    4. close CONFIG_UBSAN_ENUM
-
-6. modify ./scripts/mod/modpost.c
-    1. skip add_srcversion (just return)
-    2. force add_retpoline (#ifdef --> #ifndef)
-    3. force add_intree_flag
-
-7. make modules_prepare LOCALVERSION=-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-8. Append padding at the end of struct module <include/linux/module.h>
-struct module {
-    enum module_state state;
-
-	/* Member of list of modules */
-	struct list_head list;
-
-	/* Unique handle for this module */
-	char name[MODULE_NAME_LEN];
-    
-    ....
-    
-    char padding[1024];
-};
-
-This is because struct module size is different in different kernel versions or with different CONFIG item.
-
-
-9. make modules M=/home/dmpatch
-10. strip --strip-debug /home/dmpatch/dm_patch.ko
-

DMPATCH/ubuntu_build.sh

@@ -1,65 +0,0 @@
-#!/bin/bash
-
-FTPIP=192.168.44.1
-FTPUSR='a:a'
-
-rm -f dmpatch.c Makefile Makefile_IBT
-
-for f in dmpatch.c Makefile Makefile_IBT; do
-	curl -s -u $FTPUSR ftp://$FTPIP/$f -o $f
-	if [ -f $f ]; then
-		echo "download $f OK ..."
-	else
-		echo "download $f FAILED ..."
-		exit 1
-	fi
-done
-
-
-
-rm -f *.ko
-
-
-echo "build dm_patch.ko ..."
-rm -rf ./aa
-mkdir ./aa
-
-cp -a *.c aa/
-cp -a Makefile aa/
-
-cd /home/panda/linux-source-5.15.0
-make modules M=/home/panda/build/aa/
-strip --strip-debug /home/panda/build/aa/dm_patch.ko
-cd -
-
-cp -a aa/dm_patch.ko  ./
-
-
-
-echo "build dm_patch_ibt.ko ..."
-rm -rf ./aa
-mkdir ./aa
-
-cp -a *.c aa/
-cp -a Makefile_IBT aa/Makefile
-
-cd /home/panda/linux-source-5.15.0
-make modules M=/home/panda/build/aa/
-strip --strip-debug /home/panda/build/aa/dm_patch_ibt.ko
-cd -
-
-cp -a aa/dm_patch_ibt.ko ./
-
-rm -rf ./aa
-
-
-curl -s -T dm_patch.ko -u $FTPUSR ftp://$FTPIP/dm_patch_64.ko || exit 1
-curl -s -T dm_patch_ibt.ko -u $FTPUSR ftp://$FTPIP/dm_patch_ibt_64.ko || exit 1
-
-
-if [ -f ./dm_patch.ko -a -f ./dm_patch_ibt.ko ]; then
-	echo -e "\n\n=============== SUCCESS =============\n\n"
-else
-	echo -e "\n\n=============== FAILED ==============\n\n"
-fi
-

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

@@ -466,6 +466,37 @@ grub_err_t grub_disk_blocklist_read(void *chunklist, grub_uint64_t sector,
     return 0;
 }
 
+grub_err_t grub_disk_blocklist_read2(grub_disk_t disk, grub_uint64_t sector, 
+    grub_uint64_t size, char *buf)
+{
+    ventoy_img_chunk_list *chunk_list = (ventoy_img_chunk_list *)(disk->read_hook_data);
+
+    if (buf < chunk_list->buf || buf >= chunk_list->buf + VTOY_CHUNK_BUF_SIZE)
+    {
+        return 2;
+    }
+
+    if ((chunk_list->buf + chunk_list->last_off) != buf)
+    {
+        chunk_list->err_code = VTOY_CHUNK_ERR_NOT_FLAT;
+        return 0;
+    }
+
+    if (chunk_list->last_off + size > VTOY_CHUNK_BUF_SIZE)
+    {
+        chunk_list->err_code = VTOY_CHUNK_ERR_OVER_FLOW;
+        return 0;
+    }
+
+    chunk_list->last_off += (grub_uint32_t)size;
+    if (chunk_list->last_off == VTOY_CHUNK_BUF_SIZE)
+    {
+        chunk_list->last_off = 0;
+    }
+
+    return grub_disk_blocklist_read(chunk_list, sector, size, disk->log_sector_size);
+}
+
 /* Read data from the disk.  */
 grub_err_t
 grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
@@ -475,6 +506,14 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
     {
         return grub_disk_blocklist_read((ventoy_img_chunk_list *)disk->read_hook_data, sector, size, disk->log_sector_size);
     }
+    else if (disk->read_hook == (grub_disk_read_hook_t)(void *)grub_disk_blocklist_read2)
+    {
+        grub_err_t rv = grub_disk_blocklist_read2(disk, sector, size, (char *)buf);
+        if (rv != 2)
+        {
+            return rv;
+        }
+    }
 
   /* First of all, check if the region is within the disk.  */
   if (grub_disk_adjust_range (disk, &sector, &offset, size) != GRUB_ERR_NONE)

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

@@ -202,6 +202,10 @@ int ventoy_get_fs_type(const char *fs)
     {
         return ventoy_fs_fat;
     }
+    else if (grub_strncmp(fs, "btrfs", 5) == 0)
+    {
+        return ventoy_fs_btrfs;
+    }
 
     return ventoy_fs_max;
 }
@@ -1696,7 +1700,7 @@ static int ventoy_vlnk_probe_fs(ventoy_vlnk_part *cur)
 {
     const char *fs[ventoy_fs_max + 1] = 
     {
-        "exfat", "ntfs", "ext2", "xfs", "udf", "fat", NULL
+        "exfat", "ntfs", "ext2", "xfs", "udf", "fat", "btrfs", NULL
     };
 
     if (!cur->dev)
@@ -3251,13 +3255,49 @@ void ventoy_fill_os_param(grub_file_t file, ventoy_os_param *param)
     return;
 }
 
-int ventoy_check_block_list(grub_file_t file, ventoy_img_chunk_list *chunklist, grub_disk_addr_t start)
+static const char* g_chunk_err_msg[VTOY_CHUNK_ERR_MAX] = 
+{
+    "success",
+    "File system use more than 1 disks! (maybe RAID)",
+    "File system enable RAID feature, this is NOT supported!",
+    "File is compressed in disk, this is not supported!",
+    "File not flat in disk! (maybe compressed)",
+    "Read buffer overflow!",
+};
+
+static const char * ventoy_get_chunk_err_msg(grub_uint32_t err)
+{
+    if (err < VTOY_CHUNK_ERR_MAX)
+    {
+        return g_chunk_err_msg[err];
+    }
+    
+    return "XXXX";
+}
+
+int ventoy_check_block_list(grub_file_t file, ventoy_img_chunk_list *chunklist, 
+grub_disk_addr_t start, char *err, grub_uint32_t len)
 {
     grub_uint32_t i = 0;
     grub_uint64_t total = 0;
     grub_uint64_t fileblk = 0;
     ventoy_img_chunk *chunk = NULL;
 
+    if (chunklist->err_code)
+    {
+        if (err)
+        {
+            grub_snprintf(err, len, "%s", ventoy_get_chunk_err_msg(chunklist->err_code));
+        }
+    
+        return 1;
+    }
+
+    if (err)
+    {
+        grub_snprintf(err, len, "Unsupported chunk list.");
+    }
+
     for (i = 0; i < chunklist->cur_chunk; i++)
     {
         chunk = chunklist->chunk + i;
@@ -3307,6 +3347,10 @@ int ventoy_get_block_list(grub_file_t file, ventoy_img_chunk_list *chunklist, gr
     {
         grub_ext_get_file_chunk(start, file, chunklist);        
     }
+    else if (fs_type == ventoy_fs_btrfs)
+    {
+        grub_btrfs_get_file_chunk(start, file, chunklist);        
+    }
     else
     {
         file->read_hook = (grub_disk_read_hook_t)(void *)grub_disk_blocklist_read;
@@ -3366,8 +3410,10 @@ int ventoy_get_block_list(grub_file_t file, ventoy_img_chunk_list *chunklist, gr
 static grub_err_t ventoy_cmd_img_sector(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     int rc;
+    int fs_type;
     grub_file_t file;
     grub_disk_addr_t start;
+    char errmsg[128];
     
     (void)ctxt;
     (void)argc;
@@ -3387,7 +3433,8 @@ static grub_err_t ventoy_cmd_img_sector(grub_extcmd_context_t ctxt, int argc, ch
         grub_free(g_img_chunk_list.chunk);
     }
 
-    if (ventoy_get_fs_type(file->fs->name) >= ventoy_fs_max)
+    fs_type = ventoy_get_fs_type(file->fs->name);
+    if (fs_type >= ventoy_fs_max)
     {
         grub_file_close(file);
         return grub_error(GRUB_ERR_BAD_ARGUMENT, "Unsupported filesystem %s\n", file->fs->name); 
@@ -3408,12 +3455,17 @@ static grub_err_t ventoy_cmd_img_sector(grub_extcmd_context_t ctxt, int argc, ch
 
     ventoy_get_block_list(file, &g_img_chunk_list, start);
 
-    rc = ventoy_check_block_list(file, &g_img_chunk_list, start);
+    rc = ventoy_check_block_list(file, &g_img_chunk_list, start, errmsg, sizeof(errmsg));
     grub_file_close(file);
 
     if (rc)
     {
-        return grub_error(GRUB_ERR_NOT_IMPLEMENTED_YET, "Unsupported chunk list.\n");
+        if (fs_type == ventoy_fs_btrfs)
+        {
+            vtoy_tip(10, "%s\n\nWill exit in 10 seconds...\n", errmsg);
+            grub_exit();            
+        }
+        return grub_error(GRUB_ERR_NOT_IMPLEMENTED_YET, "%s\n", errmsg);
     }
 
     grub_memset(&g_grub_param->file_replace, 0, sizeof(g_grub_param->file_replace));
@@ -3950,6 +4002,7 @@ static grub_err_t ventoy_cmd_test_block_list(grub_extcmd_context_t ctxt, int arg
     grub_uint32_t i;
     grub_file_t file;
     ventoy_img_chunk_list chunklist;
+    char errmsg[128];
     
     (void)ctxt;
     (void)argc;
@@ -3973,8 +4026,9 @@ static grub_err_t ventoy_cmd_test_block_list(grub_extcmd_context_t ctxt, int arg
 
     ventoy_get_block_list(file, &chunklist, 0);
     
-    if (0 != ventoy_check_block_list(file, &chunklist, 0))
+    if (0 != ventoy_check_block_list(file, &chunklist, 0, errmsg, sizeof(errmsg)))
     {
+        grub_printf("%s\n", errmsg);
         grub_printf("########## UNSUPPORTED ###############\n");
     }
 
@@ -6985,6 +7039,7 @@ static cmd_para ventoy_cmds[] =
     { "vt_cmp_checksum", ventoy_cmd_cmp_checksum, 0, NULL, "", "", NULL },
     { "vt_push_menu_lang", ventoy_cmd_push_menulang, 0, NULL, "", "", NULL },
     { "vt_pop_menu_lang", ventoy_cmd_pop_menulang, 0, NULL, "", "", NULL },
+    { "vt_linux_initrd", ventoy_cmd_linux_initrd, 0, NULL, "", "", NULL },
 
 };
 

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

@@ -37,6 +37,7 @@
 #define VTOY_SIZE_4MB     (4 * 1024 * 1024)
 #define VTOY_SIZE_512KB   (512 * 1024)
 #define VTOY_SIZE_1KB     1024
+#define VTOY_SIZE_4KB     4096
 #define VTOY_SIZE_32KB    (32 * 1024)
 #define VTOY_SIZE_128KB   (128 * 1024)
 
@@ -95,6 +96,12 @@
     return (err);\
 }
 
+#define vtoy_tip(wait_seconds, fmt, ...) \
+    grub_printf(fmt, __VA_ARGS__); \
+    grub_refresh(); \
+    grub_sleep(wait_seconds)
+
+
 #define VTOY_APPEND_NEWBUF(buf) \
 {\
     char *__c = buf;\
@@ -656,6 +663,7 @@ grub_uint32_t ventoy_get_iso_boot_catlog(grub_file_t file);
 int ventoy_has_efi_eltorito(grub_file_t file, grub_uint32_t sector);
 grub_err_t ventoy_cmd_linux_chain_data(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_linux_systemd_menu(grub_extcmd_context_t ctxt, int argc, char **args);
+grub_err_t ventoy_cmd_linux_initrd(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_linux_limine_menu(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_linux_locate_initrd(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_initrd_count(grub_extcmd_context_t ctxt, int argc, char **args);
@@ -1150,7 +1158,7 @@ int ventoy_plugin_find_conf_replace(const char *iso, conf_replace *nodes[VTOY_MA
 dud * ventoy_plugin_find_dud(const char *iso);
 int ventoy_plugin_load_dud(dud *node, const char *isopart);
 int ventoy_get_block_list(grub_file_t file, ventoy_img_chunk_list *chunklist, grub_disk_addr_t start);
-int ventoy_check_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, char *err, grub_uint32_t len);
 void ventoy_plugin_dump_persistence(void);
 grub_err_t ventoy_cmd_set_theme(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_set_theme_path(grub_extcmd_context_t ctxt, int argc, char **args);
@@ -1273,6 +1281,7 @@ typedef struct systemd_menu_ctx
 {
     char *dev;
     char *buf;
+    const char *initrd_cmd;
     int pos;
     int len;
 }systemd_menu_ctx;

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

@@ -1867,7 +1867,7 @@ static int ventoy_systemd_conf_hook(const char *filename, const struct grub_dirh
         ctx->pos = oldpos;
         goto out;
     }
-    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "  echo \"Downloading kernel ...\"\n  linux %s ", tag);
+    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "  echo \"Loading kernel ...\"\n  linux %s ", tag);
 
     /* kernel options */
     grub_memcpy(filebuf, bkbuf, file->size);
@@ -1876,7 +1876,7 @@ static int ventoy_systemd_conf_hook(const char *filename, const struct grub_dirh
 
     
     /* initrd xxx xxx xxx */
-    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "  echo \"Downloading initrd ...\"\n  initrd ");
+    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "  echo \"Loading initrd ...\"\n  %s ", ctx->initrd_cmd);
     grub_memcpy(filebuf, bkbuf, file->size);
     tag = ventoy_systemd_conf_tag(filebuf, "initrd", 1);
     while (tag)
@@ -1893,6 +1893,34 @@ out:
     return 0;
 }
 
+grub_err_t ventoy_cmd_linux_initrd(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    int i;    
+    int pos = 0;
+    char *buf = NULL;
+
+    (void)ctxt;
+
+    buf = (char *)grub_malloc(VTOY_SIZE_4KB);
+    if (!buf)
+    {
+        return 1;
+    }
+
+    pos += grub_snprintf(buf + pos, VTOY_SIZE_4KB - pos, "initrd mem:%s:size:%s",
+        grub_env_get("ventoy_cpio_addr"), grub_env_get("ventoy_cpio_size"));
+    
+    for (i = 0; i < argc; i++)
+    {
+        pos += grub_snprintf(buf + pos, VTOY_SIZE_4KB - pos, " newc:initrd%03d:%s", i + 1, args[i]);
+    }
+
+    grub_script_execute_sourcecode(buf);
+    grub_free(buf);
+
+    return 0;
+}
+
 grub_err_t ventoy_cmd_linux_systemd_menu(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     static char *buf = NULL;
@@ -1936,6 +1964,7 @@ grub_err_t ventoy_cmd_linux_systemd_menu(grub_extcmd_context_t ctxt, int argc, c
 
     ctx.dev = args[0];
     ctx.buf = buf;
+    ctx.initrd_cmd = args[2] ? args[2] : "initrd";
     ctx.pos = 0;
     ctx.len = VTOY_LINUX_SYSTEMD_MENU_MAX_BUF;
     fs->fs_dir(dev, "/loader/entries", ventoy_systemd_conf_hook, &ctx);

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

@@ -2765,7 +2765,7 @@ int ventoy_plugin_get_persistent_chunklist(const char *isopath, int index, vento
     start = file->device->disk->partition->start;
     ventoy_get_block_list(file, chunk_list, start);
     
-    if (0 != ventoy_check_block_list(file, chunk_list, start))
+    if (0 != ventoy_check_block_list(file, chunk_list, start, NULL, 0))
     {
         grub_free(chunk_list->chunk);
         chunk_list->chunk = NULL;

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

@@ -197,6 +197,8 @@ grub_disk_t EXPORT_FUNC(grub_disk_open) (const char *name);
 void EXPORT_FUNC(grub_disk_close) (grub_disk_t disk);
 grub_err_t EXPORT_FUNC(grub_disk_blocklist_read)(void *chunklist, grub_uint64_t sector, 
     grub_uint64_t size, grub_uint32_t log_sector_size);
+grub_err_t EXPORT_FUNC(grub_disk_blocklist_read2)(grub_disk_t disk, grub_uint64_t sector, 
+    grub_uint64_t size, char *buf);
 
 grub_err_t EXPORT_FUNC(grub_disk_read) (grub_disk_t disk,
 					grub_disk_addr_t sector,

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

@@ -36,6 +36,7 @@ typedef enum ventoy_fs_type
     ventoy_fs_xfs,       /* 3: XFS */
     ventoy_fs_udf,       /* 4: UDF */
     ventoy_fs_fat,       /* 5: FAT */
+    ventoy_fs_btrfs,     /* 6: BTRFS */
 
     ventoy_fs_max
 }ventoy_fs_type;
@@ -252,12 +253,15 @@ typedef struct ventoy_virt_chunk
 #define DEFAULT_CHUNK_NUM   1024
 typedef struct ventoy_img_chunk_list
 {
+    char *buf;
+    grub_uint32_t last_off;
+    grub_uint32_t err_code;
+
     grub_uint32_t max_chunk;
     grub_uint32_t cur_chunk;
     ventoy_img_chunk *chunk;
 }ventoy_img_chunk_list;
 
-
 #pragma pack()
 
 #define ventoy_filt_register grub_file_filter_register
@@ -291,7 +295,21 @@ typedef struct ventoy_grub_param
 
 #pragma pack()
 
+#define VTOY_CHUNK_BUF_SIZE          (4 * 1024 * 1024)
+
+typedef enum vtoy_chunk_err
+{
+    VTOY_CHUNK_ERR_NONE = 0,
+    VTOY_CHUNK_ERR_MULTI_DEV,
+    VTOY_CHUNK_ERR_RAID,
+    VTOY_CHUNK_ERR_COMPRESS,
+    VTOY_CHUNK_ERR_NOT_FLAT,
+    VTOY_CHUNK_ERR_OVER_FLOW,
+    VTOY_CHUNK_ERR_MAX
+}vtoy_chunk_err;
+
 int grub_ext_get_file_chunk(grub_uint64_t part_start, grub_file_t file, ventoy_img_chunk_list *chunk_list);
+int grub_btrfs_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);
 int grub_iso9660_is_joliet(void);

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

@@ -67,4 +67,5 @@ fi
 
 if [ -f $VTOY_PATH/ventoy_persistent_map ]; then
     $SED "1 aexport cow_label=vtoycow" -i /init 
+    $SED "/parse.*cmdline/aecho cow_label=vtoycow>>/tmp/cmdline" -i /init 
 fi

IMG/cpio/ventoy/ventoy_chain.sh

@@ -177,6 +177,8 @@ ventoy_get_os_type() {
             echo 'deepin'; return
         elif $GREP -q 'chinauos' /etc/os-release; then
             echo 'deepin'; return
+        elif $GREP -qi 'aerynos' /etc/os-release; then
+            echo 'rhel7'; return
         fi
     fi
     
@@ -373,6 +375,13 @@ ventoy_get_os_type() {
             echo 'openEuler'; return
         fi
     fi
+    if [ -f /etc/kylin-release ]; then
+        if $GREP -i -q -m1 'Kylin.*Server.* V1[1-9] ' /etc/kylin-release; then
+            echo 'openEuler'; return
+        fi
+    fi
+
+
     
     if $GREP -q 'chimera' /proc/version; then
         echo 'chimera'; return

INSTALL/Ventoy2Disk.sh

@@ -21,7 +21,7 @@ elif uname -m | grep -E -q 'mips64'; then
 else
     export TOOLDIR=i386
 fi
-export PATH="./tool/$TOOLDIR:$PATH"
+export PATH="$OLDDIR/tool/$TOOLDIR:$PATH"
 
 
 echo ''
@@ -61,6 +61,14 @@ if [ $? -eq 0 ]; then
     done
 fi
 
+#use static linked mkexfatfs for musl-libc environment
+if [ -f mkexfatfs_static ]; then
+    if ldd --version 2>&1 | grep -qi musl; then
+        mv mkexfatfs mkexfatfs_shared
+        mv mkexfatfs_static mkexfatfs
+    fi
+fi
+
 cd ../../
 chmod +x -R ./tool/$TOOLDIR
 

INSTALL/grub/grub.cfg

@@ -70,6 +70,12 @@ function ventoy_acpi_param {
     fi
 }
 
+function vt_vcfg_pre_proc {
+    vt_img_sector "${vtoy_iso_part}${vt_chosen_path}"
+    vt_load_cpio  $vtoy_path  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio $vtoy_iso_part "$vt_chosen_path"
+}
+
 function ventoy_vcfg_proc {
     if vt_check_custom_boot "${1}" vt_vcfg; then
         set vtoy_chosen_path="${1}"
@@ -422,6 +428,16 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /initramfs-linux.img
     elif [ -f (loop)/boot/isolinux/initrd.gz ]; then
         vt_linux_specify_initrd_file /boot/isolinux/initrd.gz        
+    elif vt_str_begin "$vt_volume_id" "AERYNOS"; then
+        vt_vcfg_pre_proc
+
+        loopback va "${vtoy_iso_part}${vt_chosen_path}"
+        loopback vb (va)/EFI/Boot/efiboot.img
+
+        set root=(vb)
+        vt_systemd_menu (vb) vt_sys_menu_mem vt_linux_initrd
+        configfile "mem:${vt_sys_menu_mem_addr}:size:${vt_sys_menu_mem_size}"
+
     fi
 }
 
@@ -1428,7 +1444,7 @@ function ventoy_iso_busybox_ver {
     
         #special process for deepin-live iso
         if [ "$vt_chosen_size" = "403701760" ]; then
-            if vt_str_str "$vt_chosen_path" "/deepin-live"; then
+            if vt_strstr "$vt_chosen_path" "/deepin-live"; then
                 set ventoy_busybox_ver=64
             fi
         elif vt_str_begin "$vt_volume_id" "PHOTON_"; then
@@ -1439,6 +1455,8 @@ function ventoy_iso_busybox_ver {
             set ventoy_busybox_ver=64
         elif vt_str_begin "$vt_volume_id" "KAOS_"; then
             set ventoy_busybox_ver=64
+        elif vt_strstr "$vt_volume_id" "x86_64"; then
+            set ventoy_busybox_ver=64
 
         fi
     fi
@@ -2431,7 +2449,7 @@ function mimg_common_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.1.08"
+set VENTOY_VERSION="1.1.10"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1

INSTALL/grub/help/fa_IR.txt

@@ -0,0 +1,19 @@
+ L - انتخاب زبان
+F1 - نمایش راهنما
+F2 - مرور و بوت کردن فایل‌ها در دیسک محلی
+F3 - تغییر حالت منو بین درختی <-> لیستی
+F4 - بوت کردن ویندوز/لینوکس روی دیسک محلی
+F5 - ابزار های کمکی
+F6 - بارگیری منوی سفارشی Grub2
+F7 - تغییر حالت بین حالت GUI <-> حالت TEXT
+
+m/Ctrl+m - اعتبارسنجی فایل ایمیج (md5/sha1/sha256/sha512)
+d/Ctrl+d - حالت Memdisk (فقط برای ایمیج های کوچک WinPE/LiveCD ISO/IMG)
+w/Ctrl+w - حالت WIMBOOT (فقط برای فایل های ایزو Windows/WinPE)
+r/Ctrl+r - حالت Grub2 (فقط برای برخی از توزیع های لینوکس)
+i/Ctrl+i - حالت سازگار (فقط برای مشکل زدایی)
+u/Ctrl+u - بارگیری درایور ISO EFI (تنها برای مشکل زدایی، نمیتوان به صورت رسمی استفاده کرد)
+
+
+
+جهت بازگشت دکمه ESC را کلیک کنید ......

INSTALL/grub/help/ko_KR.txt

@@ -7,10 +7,10 @@ F5 - 유틸리티
 F6 - 사용자 지정 Grub2 메뉴 불러오기
 F7 - 그래픽 모드 <-> 텍스트 모드 간에 전환
 
-m/Ctrl+m - 체크섬 이미지 파일 (md5/sha1/sha256/sha512)
+m/Ctrl+m - 이미지 파일 체크섬 (md5/sha1/sha256/sha512)
-d/Ctrl+d - Memdisk 모드 (작은 WinPE/LiveCD ISO/IMG 전용)
+d/Ctrl+d - Memdisk 모드 (작은 WinPE/LiveCD ISO/IMG에만 해당)
-w/Ctrl+w - WIMBOOT 모드 (표준 Windows/WinPE ISO 전용)
+w/Ctrl+w - WIMBOOT 모드 (표준 Windows/WinPE ISO에만 해당)
-r/Ctrl+r - Grub2 모드 (일부 Linux 배포판에만 해당)
+r/Ctrl+r - Grub2 모드 (일반 Linux 배포판에만 해당)
 i/Ctrl+i - 호환 모드 (디버그 전용, 공식적으로 사용할 수 없음)
 u/Ctrl+u - ISO EFI 드라이버 불러오기 (디버그 전용, 공식적으로 사용할 수 없음)
 

INSTALL/grub/help/lg_UG.txt

@@ -0,0 +1,19 @@
+L - Londako Olulimi
+F1 - Laga obuyambi 
+F2 - Nnoonya era kozesa Fayiro eziri ku Disk
+F3 - Kyusa endabika ya Menu wakati wa Masaasana (Treeview) ne y'olukalala (ListView)
+F4 - Ttandika Windows/Linux ku disk erimu 
+F5 - Ebikozesebwa ebirala
+F6 - Kozesa Grub2 menu gyewerobozza
+F7 - Okukyuusa okuva mu Bifaananyi (GUI Mode) <-> Bigambo (TEXT Mode)
+
+m/Ctrl+m - Okukebera Checksum image files (md5/sha1/sha256/sha512)
+d/Ctrl+d - Memdisk Mode (Ya WinPE/LiveCD ISO/IMG entono zokka)
+w/Ctrl+w - WIMBOOT Mode (Ya Windows/WinPE ISO zokka)
+r/Ctrl+r - Grub2 Mode (Ya nkola za Linux  ezimu)
+i/Ctrl+i - Compatible Mode (Ya kutereeza kwokka (debugging))
+u/Ctrl+u - Kozesa ISO EFI driver (Ya kutereeza kwokka (debugging), tesobola kukozesebwa mu butongole) 
+
+
+
+nyiga ESC to okudda emabega ......

INSTALL/grub/help/pt_BR.txt

@@ -1,18 +1,18 @@
- L - Sele<EFBFBD><EFBFBD>o de Idiomas
+ L - Seleção de Idiomas
-F1 - Exibir informa<EFBFBD><EFBFBD>es de ajuda
+F1 - Exibir informações de ajuda
 F2 - Explorar e inicializar os arquivos no disco local
-F3 - Trocar o modo do menu entre Visualiza<EFBFBD><EFBFBD>o em <EFBFBD>rvore <-> Visualiza<EFBFBD><EFBFBD>o em Lista
+F3 - Trocar o modo do menu entre Visualização em Árvore <-> Visualização em Lista
 F4 - Inicializar o Windows/Linux no disco local
-F5 - Utilit<EFBFBD>rios
+F5 - Utilitários
 F6 - Carregar o Menu Personalizado do Grub2
 F7 - Trocar entre o Modo GUI <-> Modo TEXTO
 
 m/Ctrl+m - Checksum dos arquivos de imagem (md5/sha1/sha256/sha512)
-d/Ctrl+d - Modo Memdisk (S<EFBFBD> pros pequenos WinPE/LiveCD ISO/IMG)
+d/Ctrl+d - Modo Memdisk (Só pros pequenos WinPE/LiveCD ISO/IMG)
-w/Ctrl+w - Modo WIMBOOT (S<EFBFBD> pra arquivos ISO do Windows/WinPE)
+w/Ctrl+w - Modo WIMBOOT (Só pra arquivos ISO do Windows/WinPE)
-r/Ctrl+r - Modo Grub2 (S<EFBFBD> pra algumas distros do Linux)
+r/Ctrl+r - Modo Grub2 (Só pra algumas distros do Linux)
-i/Ctrl+i - Modo Compat<EFBFBD>vel (S<EFBFBD> pra debugging)
+i/Ctrl+i - Modo Compatível (Só pra debugging)
-u/Ctrl+u - Carregar o driver EFI da ISO (S<EFBFBD> pra debugging, n<EFBFBD>o pode ser usado oficialmente)
+u/Ctrl+u - Carregar o driver EFI da ISO (Só pra debugging, não pode ser usado oficialmente)
 
 
 

INSTALL/grub/help/sl_SI.txt

@@ -0,0 +1,19 @@
+ L - Izbira jezika
+F1 - Prikaz informacij o pomoči
+F2 - Brskanje in zagon datotek na lokalnem disku
+F3 - Preklop med načinom menija Treeview <-> ListView
+F4 - Zagon Windows/Linux na lokalnem disku
+F5 - Pripomočki
+F6 - Naložitev prilagojenega menija Grub2
+F7 - Preklop med načinom GUI <-> načinom TEXT
+
+m/Ctrl+m - Preveri kontrolno vsoto slikovnih datotek (md5/sha1/sha256/sha512)
+d/Ctrl+d - Način Memdisk (samo za majhne WinPE/LiveCD ISO/IMG)
+w/Ctrl+w - Način WIMBOOT (samo za datoteke Windows/WinPE ISO)
+r/Ctrl+r – Način Grub2 (samo za nekatere distribucije Linux)
+i/Ctrl+i – Združljiv način (samo za odpravljanje napak)
+u/Ctrl+u – Naloži ISO EFI gonilnik (samo za odpravljanje napak, uradno se ne more uporabljati)
+
+
+
+Pritisnite ESC za vrnitev ......

INSTALL/grub/hwinfo.cfg

@@ -40,17 +40,17 @@ menuentry "$VTLANG_HWINFO" --class=debug_hwinfo --class=F5tool {
     echo "Physical RAM            $grub_total_ram MB"
                                   
     echo ""                       
-    echo "Manufacture             $system_vendor"
+    echo "Manufacturer            $system_vendor"
     echo "Product Name            $system_product"
     echo "Version                 $system_version"
                                   
     echo ""                       
-    echo "Board Manufacture       $board_vendor"
+    echo "Board Manufacturer      $board_vendor"
     echo "Board Name              $board_product"
     echo "Board Version           $board_version"
                                   
     echo ""                       
-    echo "BIOS Manufacture        $bios_vendor"
+    echo "BIOS Manufacturer       $bios_vendor"
     echo "BIOS Version            $bios_ver"
     echo "BIOS Date               $bios_date"
     echo "BIOS ROM Size           $bios_size"

INSTALL/grub/menu/fa_IR.json

@@ -0,0 +1,93 @@
+{
+    "VTLANG_LANGUAGE_NAME": "Persian (فارسی)",
+    
+    "VTLANG_STR_HOTKEY_LIST": "L:زبان  F1:راهنما  F2:مرور  F3:نمای لیستی  F4:بوت محلی  F5:ابزار  F6:بازگشت",
+    "VTLANG_STR_HOTKEY_TREE": "L:زبان  F1:راهنما  F2:مرور  F3:نمای درختی  F4:بوت محلی  F5:ابزار  F6:بازگشت",
+    "VTLANG_RETURN_PREVIOUS": "بازگشت به منوی قبلی [Esc]",
+    "VTLANG_RETURN_PRV_NOESC": "بازگشت به منوی قبلی",
+    
+    "VTLANG_MENU_LANG": "منوی انتخاب زبان",
+    
+    "VTLANG_LB_SBOOT_WINDOWS": "جستجو و بوت ویندوز",
+    "VTLANG_LB_SBOOT_G4D": "جستجو و بوت Grub4dos",
+    "VTLANG_LB_SBOOT_HDD1": "بوت اولین دیسک محلی",
+    "VTLANG_LB_SBOOT_HDD2": "بوت دومین دیسک محلی",
+    "VTLANG_LB_SBOOT_HDD3": "بوت سومین دیسک محلی",
+    "VTLANG_LB_SBOOT_X64EFI": "جستجو و بوت BOOTX64.EFI",
+    "VTLANG_LB_SBOOT_IA32EFI": "جستجو و بوت BOOTIA32.EFI",
+    "VTLANG_LB_SBOOT_AA64EFI": "جستجو و بوت BOOTAA64.EFI",
+    "VTLANG_LB_SBOOT_XORBOOT": "جستجو و بوت xorboot",
+    
+    "VTLANG_FILE_CHKSUM": "اعتبارسنجی فایل",
+    "VTLANG_CHKSUM_MD5_CALC": "محاسبه md5sum",
+    "VTLANG_CHKSUM_SHA1_CALC": "محاسبه sha1sum",
+    "VTLANG_CHKSUM_SHA256_CALC": "محاسبه sha256sum",
+    "VTLANG_CHKSUM_SHA512_CALC": "محاسبه sha512sum",
+    "VTLANG_CHKSUM_MD5_CALC_CHK": "محاسبه و بررسی md5sum",
+    "VTLANG_CHKSUM_SHA1_CALC_CHK": "محاسبه و بررسی sha1sum",
+    "VTLANG_CHKSUM_SHA256_CALC_CHK": "محاسبه و بررسی sha256sum",
+    "VTLANG_CHKSUM_SHA512_CALC_CHK": "محاسبه و بررسی sha512sum",
+    
+    "VTLANG_POWER": "انرژی",
+    "VTLANG_POWER_REBOOT": "ریبوت",
+    "VTLANG_POWER_HALT": "توقف",
+    "VTLANG_POWER_BOOT_EFIFW": "ریبوت به تنظیمات EFI",
+    
+    "VTLANG_KEYBRD_LAYOUT": "نمایه صفحه کلید",
+    "VTLANG_HWINFO": "اطلاعات سخت افزار",
+    
+    "VTLANG_RESOLUTION_CFG": "پیکربندی رزولوشن",
+    "VTLANG_SCREEN_MODE": "حالت نمایش صفحه",
+    "VTLANG_SCREEN_TEXT_MODE": "حالت متنی اجباری",
+    "VTLANG_SCREEN_GUI_MODE": "حالت گرافیکی اجباری",
+    
+    "VTLANG_THEME_SELECT": "انتخاب تم",
+    
+    "VTLANG_UEFI_UTIL": "ابزار های کمکی Ventoy UEFI",
+    "VTLANG_UTIL_SHOW_EFI_DRV": "نمایش درایور های EFI",
+    "VTLANG_UTIL_FIX_BLINIT_FAIL": "رفع خطای Windows BlinitializeLibrary",
+    
+    "VTLANG_JSON_CHK_JSON": "بررسی پیکربندی json افزونه (ventoy.json)",
+    "VTLANG_JSON_CHK_CONTROL": "بررسی پیکربندی افزونه کنترل سراسری",
+    "VTLANG_JSON_CHK_THEME": "بررسی پیکربندی افزونه قالب",
+    "VTLANG_JSON_CHK_AUTOINS": "بررسی پیکربندی افزونه نصب خودکار",
+    "VTLANG_JSON_CHK_PERSIST": "بررسی پیکربندی افزونه‌ی تداوم",
+    "VTLANG_JSON_CHK_MENU_ALIAS": "بررسی پیکربندی افزونه نام مستعار منو",
+    "VTLANG_JSON_CHK_MENU_TIP": "بررسی پیکربندی افزونه نکته منو",
+    "VTLANG_JSON_CHK_MENU_CLASS": "بررسی پیکربندی افزونه کلاس منو",
+    "VTLANG_JSON_CHK_INJECTION": "بررسی پیکربندی افزونه تزریق",
+    "VTLANG_JSON_CHK_AUTO_MEMDISK": "بررسی پیکربندی افزونه memdisk خودکار",
+    "VTLANG_JSON_CHK_IMG_LIST": "بررسی پیکربندی افزونه لیست ایمیج ها",
+    "VTLANG_JSON_CHK_IMG_BLIST": "بررسی پیکربندی افزونه لیست سیاه ایمیج",
+    "VTLANG_JSON_CHK_CONF_REPLACE": "بررسی پیکربندی افزونه جایگزینی فایل پیکربندی بوت",
+    "VTLANG_JSON_CHK_DUD": "بررسی پیکربندی افزونه dud",
+    "VTLANG_JSON_CHK_PASSWORD": "بررسی پیکربندی افزونه کلمه عبور",
+    
+    "VTLANG_NORMAL_MODE": "بوت در حالت عادی",
+    "VTLANG_WIMBOOT_MODE": "بوت در حالت wimboot",
+    "VTLANG_GRUB2_MODE": "بوت در حالت grub2",
+    "VTLANG_MEMDISK_MODE": "بوت در حالت memdisk",
+    
+    "VTLANG_RET_TO_LISTVIEW": "بازگشت به نمای لیستی",
+    "VTLANG_RET_TO_TREEVIEW": "بازگشت به نمای درختی",
+    
+    "VTLANG_NO_AUTOINS_SCRIPT": "بوت بدون قالب نصب خودکار",
+    "VTLANG_AUTOINS_USE": "بوت با",
+    
+    "VTLANG_NO_PERSIST": "بوت بدون تداوم",
+    "VTLANG_PERSIST_USE": "بوت با",
+    
+    "VTLANG_BROWER_RETURN": "بازگشت",
+    
+    "VTLANG_ENTER_EXIT": "جهت خروج دکمه Enter را فشار دهید",
+    "VTLANG_ENTER_REBOOT": "جهت ریبوت دکمه Enter را فشار دهید",
+    "VTLANG_ENTER_CONTINUE": "جهت ادامه دکمه Enter را فشار دهید",
+    
+    "VTLANG_CTRL_TEMP_SET": "تنظیمات کنترل موقت",
+    "VTLANG_WIN11_BYPASS_CHECK": "دور زدن بررسی CPU/TPM/SecureBoot در هنگام نصب ویندوز 11",
+    "VTLANG_WIN11_BYPASS_NRO": "دور زدن نیاز به حساب کاربری آنلاین هنگام نصب ویندوز 11",
+    "VTLANG_LINUX_REMOUNT": "اتصال پارتیشن Ventoy بعد از بوت لینوکس",
+    "VTLANG_SECONDARY_BOOT_MENU": "نمایش منوی بوت ثانویه",
+    
+    "MENU_STR_XXX": ""
+}

INSTALL/grub/menu/id_ID.json

@@ -43,7 +43,7 @@
     
     "VTLANG_THEME_SELECT": "Pilih Tema",
     
-    "VTLANG_UEFI_UTIL": "Ventoy UEFI Utilities",
+    "VTLANG_UEFI_UTIL": "Utilitas UEFI Ventoy",
     "VTLANG_UTIL_SHOW_EFI_DRV": "Tampilkan Driver EFI",
     "VTLANG_UTIL_FIX_BLINIT_FAIL": "Memperbaiki Kegagalan Windows BlinitializeLibrary",
     
@@ -80,14 +80,14 @@
     "VTLANG_BROWER_RETURN": "Kembali",
     
     "VTLANG_ENTER_EXIT": "tekan tombol Enter untuk keluar",
-    "VTLANG_ENTER_REBOOT": "tekan tombol Enter untuk reboot",
+    "VTLANG_ENTER_REBOOT": "tekan tombol Enter untuk memulai ulang",
     "VTLANG_ENTER_CONTINUE": "tekan tombol Enter untuk melanjutkan",
     
-    "VTLANG_CTRL_TEMP_SET": "Temporary Control Settings",
+    "VTLANG_CTRL_TEMP_SET": "Pengaturan Kontrol Sementara",
-    "VTLANG_WIN11_BYPASS_CHECK": "Bypass CPU/TPM/SecureBoot check when install Windows 11",
+    "VTLANG_WIN11_BYPASS_CHECK": "Melewati pemeriksaaan CPU/TPM/SecureBoot ketika memasang Windows 11",
-    "VTLANG_WIN11_BYPASS_NRO": "Bypass online account requirement when install Windows 11",
+    "VTLANG_WIN11_BYPASS_NRO": "Melewati persyaratan akun online ketika memasang Windows 11",
-    "VTLANG_LINUX_REMOUNT": "Mount Ventoy partition after boot Linux",
+    "VTLANG_LINUX_REMOUNT": "Memuat partisi Ventoy setelah boot ke Linux",
-    "VTLANG_SECONDARY_BOOT_MENU": "Show secondary boot menu",
+    "VTLANG_SECONDARY_BOOT_MENU": "Tampilkan menu boot sekunder",
     
     "MENU_STR_XXX": ""
 }

INSTALL/grub/menu/lg_UG.json

@@ -0,0 +1,93 @@
+{
+    "VTLANG_LANGUAGE_NAME": "English (English)",
+    
+    "VTLANG_STR_HOTKEY_LIST": "L:Language  F1:Help  F2:Browse  F3:ListView  F4:Localboot  F5:Tools  F6:ExMenu",
+    "VTLANG_STR_HOTKEY_TREE": "L:Language  F1:Help  F2:Browse  F3:TreeView  F4:Localboot  F5:Tools  F6:ExMenu",
+    "VTLANG_RETURN_PREVIOUS": "Return to previous menu [Esc]",
+    "VTLANG_RETURN_PRV_NOESC": "Return to previous menu",
+    
+    "VTLANG_MENU_LANG": "Menu Language Select",
+    
+    "VTLANG_LB_SBOOT_WINDOWS": "Search and boot Windows",
+    "VTLANG_LB_SBOOT_G4D": "Search and boot Grub4dos",
+    "VTLANG_LB_SBOOT_HDD1": "Boot the 1st local disk",
+    "VTLANG_LB_SBOOT_HDD2": "Boot the 2nd local disk",
+    "VTLANG_LB_SBOOT_HDD3": "Boot the 3rd local disk",
+    "VTLANG_LB_SBOOT_X64EFI": "Search and boot BOOTX64.EFI",
+    "VTLANG_LB_SBOOT_IA32EFI": "Search and boot BOOTIA32.EFI",
+    "VTLANG_LB_SBOOT_AA64EFI": "Search and boot BOOTAA64.EFI",
+    "VTLANG_LB_SBOOT_XORBOOT": "Search and boot xorboot",
+    
+    "VTLANG_FILE_CHKSUM": "File checksum",
+    "VTLANG_CHKSUM_MD5_CALC": "Calculate md5sum",
+    "VTLANG_CHKSUM_SHA1_CALC": "Calculate sha1sum",
+    "VTLANG_CHKSUM_SHA256_CALC": "Calculate sha256sum",
+    "VTLANG_CHKSUM_SHA512_CALC": "Calculate sha512sum",
+    "VTLANG_CHKSUM_MD5_CALC_CHK": "Calculate and check md5sum",
+    "VTLANG_CHKSUM_SHA1_CALC_CHK": "Calculate and check sha1sum",
+    "VTLANG_CHKSUM_SHA256_CALC_CHK": "Calculate and check sha256sum",
+    "VTLANG_CHKSUM_SHA512_CALC_CHK": "Calculate and check sha512sum",
+    
+    "VTLANG_POWER": "Power",
+    "VTLANG_POWER_REBOOT": "Reboot",
+    "VTLANG_POWER_HALT": "Halt",
+    "VTLANG_POWER_BOOT_EFIFW": "Reboot to EFI setup",
+    
+    "VTLANG_KEYBRD_LAYOUT": "Keyboard Layouts",
+    "VTLANG_HWINFO": "Hardware Information",
+    
+    "VTLANG_RESOLUTION_CFG": "Resolution Configuration",
+    "VTLANG_SCREEN_MODE": "Screen Display Mode",
+    "VTLANG_SCREEN_TEXT_MODE": "Force Text Mode",
+    "VTLANG_SCREEN_GUI_MODE": "Force Graphics Mode",
+    
+    "VTLANG_THEME_SELECT": "Theme Select",
+    
+    "VTLANG_UEFI_UTIL": "Ventoy UEFI Utilities",
+    "VTLANG_UTIL_SHOW_EFI_DRV": "Show EFI Drivers",
+    "VTLANG_UTIL_FIX_BLINIT_FAIL": "Fixup Windows BlinitializeLibrary Failure",
+    
+    "VTLANG_JSON_CHK_JSON": "Check plugin json configuration (ventoy.json)",
+    "VTLANG_JSON_CHK_CONTROL": "Check global control plugin configuration",
+    "VTLANG_JSON_CHK_THEME": "Check theme plugin configuration",
+    "VTLANG_JSON_CHK_AUTOINS": "Check auto install plugin configuration",
+    "VTLANG_JSON_CHK_PERSIST": "Check persistence plugin configuration",
+    "VTLANG_JSON_CHK_MENU_ALIAS": "Check menu alias plugin configuration",
+    "VTLANG_JSON_CHK_MENU_TIP": "Check menu tip plugin configuration",
+    "VTLANG_JSON_CHK_MENU_CLASS": "Check menu class plugin configuration",
+    "VTLANG_JSON_CHK_INJECTION": "Check injection plugin configuration",
+    "VTLANG_JSON_CHK_AUTO_MEMDISK": "Check auto memdisk plugin configuration",
+    "VTLANG_JSON_CHK_IMG_LIST": "Check image list plugin configuration",
+    "VTLANG_JSON_CHK_IMG_BLIST": "Check image blacklist plugin configuration",
+    "VTLANG_JSON_CHK_CONF_REPLACE": "Check boot conf replace plugin configuration",
+    "VTLANG_JSON_CHK_DUD": "Check dud plugin configuration",
+    "VTLANG_JSON_CHK_PASSWORD": "Check password plugin configuration",
+    
+    "VTLANG_NORMAL_MODE": "Boot in normal mode",
+    "VTLANG_WIMBOOT_MODE": "Boot in wimboot mode",
+    "VTLANG_GRUB2_MODE": "Boot in grub2 mode",
+    "VTLANG_MEMDISK_MODE": "Boot in memdisk mode",
+    
+    "VTLANG_RET_TO_LISTVIEW": "Return to ListView",
+    "VTLANG_RET_TO_TREEVIEW": "Return to TreeView",
+    
+    "VTLANG_NO_AUTOINS_SCRIPT": "Boot without auto installation template",
+    "VTLANG_AUTOINS_USE": "Boot with",
+    
+    "VTLANG_NO_PERSIST": "Boot without persistence",
+    "VTLANG_PERSIST_USE": "Boot with",
+    
+    "VTLANG_BROWER_RETURN": "Return",
+    
+    "VTLANG_ENTER_EXIT": "press Enter key to exit",
+    "VTLANG_ENTER_REBOOT": "press Enter key to reboot",
+    "VTLANG_ENTER_CONTINUE": "press Enter key to continue",
+    
+    "VTLANG_CTRL_TEMP_SET": "Temporary Control Settings",
+    "VTLANG_WIN11_BYPASS_CHECK": "Bypass CPU/TPM/SecureBoot check when install Windows 11",
+    "VTLANG_WIN11_BYPASS_NRO": "Bypass online account requirement when install Windows 11",
+    "VTLANG_LINUX_REMOUNT": "Mount Ventoy partition after boot Linux",
+    "VTLANG_SECONDARY_BOOT_MENU": "Show secondary boot menu",
+    
+    "MENU_STR_XXX": ""
+}

INSTALL/tool/VentoyWorker.sh

@@ -12,7 +12,7 @@ print_usage() {
     echo '   -l  list Ventoy information in sdX'
     echo ''
     echo '  OPTION: (optional)'
-    echo '   -r SIZE_MB  preserve some space at the bottom of the disk (only for install)'
+    echo '   -r SIZE_MiB preserve some space (MiB) at the bottom of the disk (only for install)'
     echo '   -s/-S       enable/disable secure boot support (default is enabled)'
     echo '   -g          use GPT partition style, default is MBR (only for install)'
     echo '   -L          Label of the 1st exfat partition (default is Ventoy)'
@@ -93,7 +93,7 @@ fi
 
 if [ -n "$RESERVE_SPACE" -a "$MODE" = "install" ]; then
     if echo $RESERVE_SIZE_MB | grep -q '^[0-9][0-9]*$'; then
-        vtdebug "User will reserve $RESERVE_SIZE_MB MB disk space"
+        vtdebug "User will reserve $RESERVE_SIZE_MB MiB disk space"
     else
         vterr "$RESERVE_SIZE_MB is invalid for reserved space"
         exit 1
@@ -231,7 +231,7 @@ if [ "$MODE" = "install" -a -z "$NONDESTRUCTIVE" ]; then
         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"
+            vterr "Can't reserve $RESERVE_SIZE_MB MiB space from $DISK"
             exit 1
         fi
     fi
@@ -239,7 +239,7 @@ if [ "$MODE" = "install" -a -z "$NONDESTRUCTIVE" ]; then
     #Print disk info
     echo "Disk : $DISK"
     parted -s $DISK p 2>&1 | grep Model
-    echo "Size : $disk_size_gb GB"
+    echo "Size : $disk_size_gb GiB"
     if [ -n "$VTGPT" ]; then
         echo "Style: GPT"
     else
@@ -248,7 +248,7 @@ if [ "$MODE" = "install" -a -z "$NONDESTRUCTIVE" ]; then
     echo ''
 
     if [ -n "$RESERVE_SPACE" ]; then
-        echo "You will reserve $RESERVE_SIZE_MB MB disk space "
+        echo "You will reserve $RESERVE_SIZE_MB MiB disk space "
     fi
     echo ''
 
@@ -395,7 +395,7 @@ elif [ "$MODE" = "install" -a -n "$NONDESTRUCTIVE" ]; then
     #Print disk info
     echo "Disk : $DISK"
     parted -s $DISK p 2>&1 | grep Model
-    echo "Size : $disk_size_gb GB" 
+    echo "Size : $disk_size_gb GiB" 
     echo "Style: $OldStyle"    
     echo ''
 
@@ -424,7 +424,7 @@ elif [ "$MODE" = "install" -a -n "$NONDESTRUCTIVE" ]; then
     PART1_MB=$(expr $PART1_4K / 256)
     PART1_NEW_MB=$(expr $PART1_MB - 32)
 
-    echo "$PART1 is ${PART1_MB}MB"
+    echo "$PART1 is ${PART1_MB}MiB"
 
     #check partition layout
     echo "check partition layout ..."

LANGUAGES/languages.json

@@ -63,6 +63,71 @@
         "STR_4KN_UNSUPPORTED":"Currently Ventoy does not support 4K native devices.",
         
         "STRXXX":""
+    },
+      {
+        "name": "Urdu (اردو)",
+        "FontFamily": "Noto Nastaliq Urdu",
+        "FontSize": 16,
+        "Author": "Muhammad Ramzan",
+
+        "STR_ERROR": "غلطی",
+        "STR_WARNING": "انتباہ",
+        "STR_INFO": "معلومات",
+        "STR_INCORRECT_DIR": "براہ کرم درست ڈائریکٹری میں چلائیں!",
+        "STR_INCORRECT_TREE_DIR": "یہاں نہ چلائیں، براہ کرم ریلیز پیکیج ڈاؤن لوڈ کریں اور وہاں چلائیں۔",
+        "STR_DEVICE": "ڈیوائس",
+        "STR_LOCAL_VER": "پیکج میں وینٹوی",
+        "STR_DISK_VER": "ڈیوائس میں وینٹوی",
+        "STR_STATUS": "اسٹیٹس - تیار",
+        "STR_INSTALL": "انسٹال کریں",
+        "STR_UPDATE": "اپڈیٹ کریں",
+        "STR_UPDATE_TIP": "اپگریڈ محفوظ ہے، ISO فائلز تبدیل نہیں ہوں گی۔#@کیا آپ جاری رکھنا چاہتے ہیں؟",
+        "STR_INSTALL_TIP": "ڈیوائس فارمیٹ ہو جائے گا اور تمام ڈیٹا ضائع ہو جائے گا۔#@کیا آپ جاری رکھنا چاہتے ہیں؟",
+        "STR_INSTALL_TIP2": "ڈیوائس فارمیٹ ہو جائے گا اور تمام ڈیٹا ضائع ہو جائے گا۔#@کیا آپ واقعی جاری رکھنا چاہتے ہیں؟ (دوبارہ تصدیق)",
+        "STR_INSTALL_SUCCESS": "مبارک ہو!#@وینٹوی کامیابی سے ڈیوائس پر انسٹال ہو گیا ہے۔",
+        "STR_INSTALL_FAILED": "انسٹالیشن کے دوران غلطی پیش آئی۔ دوبارہ USB لگائیں اور کوشش کریں۔ تفصیلات کے لیے log.txt چیک کریں۔ اگر مسئلہ برقرار رہے تو سرکاری ویب سائٹ کے FAQ دیکھیں۔",
+        "STR_UPDATE_SUCCESS": "مبارک ہو!#@وینٹوی کامیابی سے ڈیوائس پر اپڈیٹ ہو گیا ہے۔",
+        "STR_UPDATE_FAILED": "اپڈیٹ کے دوران غلطی پیش آئی۔ دوبارہ USB لگائیں اور کوشش کریں۔ تفصیلات کے لیے log.txt چیک کریں۔ اگر مسئلہ برقرار رہے تو سرکاری ویب سائٹ کے FAQ دیکھیں۔",
+        "STR_WAIT_PROCESS": "ایک عمل جاری ہے، براہ کرم انتظار کریں...",
+        "STR_MENU_OPTION": "اختیار",
+        "STR_MENU_SECURE_BOOT": "سکیور بوٹ سپورٹ",
+        "STR_MENU_PART_CFG": "پارٹیشن کنفیگریشن",
+        "STR_BTN_OK": "ٹھیک ہے",
+        "STR_BTN_CANCEL": "منسوخ کریں",
+        "STR_PRESERVE_SPACE": "ڈسک کے آخر میں کچھ جگہ محفوظ کریں",
+        "STR_SPACE_VAL_INVALID": "محفوظ جگہ کے لیے غلط ویلیو",
+        "STR_MENU_CLEAR": "وینٹوی ہٹائیں",
+        "STR_CLEAR_SUCCESS": "وینٹوی کامیابی سے ڈیوائس سے ہٹا دیا گیا ہے۔",
+        "STR_CLEAR_FAILED": "وینٹوی کو ہٹاتے وقت غلطی پیش آئی۔ دوبارہ USB لگائیں اور کوشش کریں۔ تفصیلات کے لیے log.txt چیک کریں۔",
+        "STR_MENU_PART_STYLE": "پارٹیشن اسٹائل",
+        "STR_DISK_2TB_MBR_ERROR": "2TB سے بڑی ڈیوائس کے لیے GPT منتخب کریں",
+        "STR_SHOW_ALL_DEV": "تمام ڈیوائسز دکھائیں",
+        "STR_PART_ALIGN_4KB": "پارٹیشنز کو 4KB کے ساتھ سیدھ میں رکھیں",
+        "STR_WEB_COMMUNICATION_ERR": "کمیونیکیشن ایرر:",
+        "STR_WEB_REMOTE_ABNORMAL": "کمیونیکیشن ایرر: ریموٹ ایرر",
+        "STR_WEB_REQUEST_TIMEOUT": "کمیونیکیشن ایرر: ریکویسٹ کا وقت ختم ہو گیا",
+        "STR_WEB_SERVICE_UNAVAILABLE": "کمیونیکیشن ایرر: سروس دستیاب نہیں",
+        "STR_WEB_TOKEN_MISMATCH": "ڈیمن اسٹیٹس اپڈیٹ ہو گیا، بعد میں دوبارہ کوشش کریں۔",
+        "STR_WEB_SERVICE_BUSY": "سروس مصروف ہے، بعد میں دوبارہ کوشش کریں۔",
+        "STR_MENU_VTSI_CREATE": "VTSI فائل بنائیں",
+        "STR_VTSI_CREATE_TIP": "یہ عمل ڈیوائس پر کچھ نہیں لکھے گا، صرف VTSI فائل بنائے گا۔#@کیا آپ جاری رکھنا چاہتے ہیں؟",
+        "STR_VTSI_CREATE_SUCCESS": "VTSI فائل کامیابی سے بن گئی!#@آپ Rufus(3.15+) کا استعمال کر کے اسے ڈیوائس پر لکھ سکتے ہیں تاکہ وینٹوی انسٹال مکمل ہو سکے۔",
+        "STR_VTSI_CREATE_FAILED": "VTSI فائل بنانے میں ناکام۔",
+        "STR_MENU_PART_RESIZE": "ڈیٹا محفوظ انسٹالیشن",
+        "STR_PART_RESIZE_TIP": "وینٹوی ممکن ہو تو ڈیٹا محفوظ انسٹالیشن کرے گا۔#@کیا آپ جاری رکھنا چاہتے ہیں؟",
+        "STR_PART_RESIZE_SUCCESS": "مبارک ہو!#@وینٹوی کی ڈیٹا محفوظ انسٹالیشن کامیابی سے مکمل ہو گئی۔",
+        "STR_PART_RESIZE_FAILED": "ڈیٹا محفوظ انسٹالیشن ناکام ہو گئی، تفصیلات کے لیے log.txt چیک کریں۔",
+        "STR_PART_RESIZE_UNSUPPORTED": "وینٹوی نے انسٹالیشن روک دی کیونکہ کچھ شرائط پوری نہیں ہو سکیں۔ تفصیلات کے لیے log.txt چیک کریں۔",
+        "STR_INSTALL_YES_TIP1": "انتباہ: ڈیٹا ضائع ہو جائے گا!",
+        "STR_INSTALL_YES_TIP2": "براہ کرم نیچے ٹیکسٹ باکس میں YES لکھیں تاکہ تصدیق ہو سکے کہ آپ اپگریڈ کی بجائے نیا انسٹال کرنا چاہتے ہیں۔",
+        "STR_PART_VENTOY_FS": "وینٹوی پارٹیشن کے لیے فائل سسٹم",
+        "STR_PART_FS": "فائل سسٹم",
+        "STR_PART_CLUSTER": "کلسٹر سائز",
+        "STR_PART_CLUSTER_DEFAULT": "سسٹم کا ڈیفالٹ ویلیو",
+        "STR_DONATE": "عطیہ کریں",
+        "STR_4KN_UNSUPPORTED": "فی الحال وینٹوی 4K نیٹو ڈیوائسز کو سپورٹ نہیں کرتا۔",
+        
+        "STRXXX": ""
     },
     {
         "name":"Azerbaijani (Azərbaycanca)",
@@ -649,6 +714,71 @@
         
         "STRXXX":""
     },
+	{
+        "name":"Slovenian (Slovenščina)",
+        "FontFamily":"Courier New",
+        "FontSize":16,
+        "Author":"Andrew Poženel, Urajmal",
+        
+        "STR_ERROR":"Napaka",
+        "STR_WARNING":"Opozorilo",
+        "STR_INFO":"Informacija",
+        "STR_INCORRECT_DIR":"Prosim, zaženite program v pravilni mapi!",
+        "STR_INCORRECT_TREE_DIR":"Ne izvajajte programa tukaj, prosim prenesite izdani namestitveni paket in ga izvedite tam.",
+        "STR_DEVICE":"Naprava",
+        "STR_LOCAL_VER":"Ventoy različica",
+        "STR_DISK_VER":"Ventoy v napravi",
+        "STR_STATUS":"Stanje - PRIPRAVLJEN",
+        "STR_INSTALL":"Namesti",
+        "STR_UPDATE":"Posodobi",
+        "STR_UPDATE_TIP":"Nadgradnja je varna, datoteke ISO ostanejo nespremenjene.#@Nadaljuj?",
+        "STR_INSTALL_TIP":"Naprava bo formatirana in vsi podatki bodo izgubljeni.#@Nadaljuj?",
+        "STR_INSTALL_TIP2":"Naprava bo formatirana in vsi podatki bodo izgubljeni.#@Nadaljuj? (dvakrat preverite)",
+        "STR_INSTALL_SUCCESS":"Čestitamo!#@Ventoy je bil uspešno nameščen na napravo.",
+        "STR_INSTALL_FAILED":"Med namestitvijo je prišlo do napake. Ponovno vstavite USB-napravo in poskusite znova. Podrobnosti najdete v datoteki log.txt. Če napaka še vedno obstaja, si oglejte pogosta vprašanja na uradni spletni strani.",
+        "STR_UPDATE_SUCCESS":"Čestitamo!#@Ventoy je bil uspešno posodobljen na napravi.",
+        "STR_UPDATE_FAILED":"Med posodobitvijo je prišlo do napake. Ponovno vstavite USB-napravo in poskusite znova. Podrobnosti najdete v datoteki log.txt. Če se napaka ponavlja, si oglejte pogosta vprašanja na uradni spletni strani.",
+        "STR_WAIT_PROCESS":"Nit se izvaja, prosimo počakajte...",
+        "STR_MENU_OPTION":"Možnost",
+        "STR_MENU_SECURE_BOOT":"Podpora za varen zagon",
+        "STR_MENU_PART_CFG":"Konfiguracija particije",
+        "STR_BTN_OK":"V redu",
+        "STR_BTN_CANCEL":"Prekliči",
+        "STR_PRESERVE_SPACE":"Ohrani nekaj prostora na koncu diska",
+        "STR_SPACE_VAL_INVALID":"Neveljavna vrednost za rezervirani prostor",
+        "STR_MENU_CLEAR":"Počisti Ventoy",
+        "STR_CLEAR_SUCCESS":"Ventoy je bil uspešno odstranjen iz naprave.",
+        "STR_CLEAR_FAILED":"Pri odstranjevanju Ventoya z diska je prišlo do napake. Ponovno vstavite USB-napravo in poskusite znova. Podrobnosti najdete v datoteki log.txt.",
+        "STR_MENU_PART_STYLE":"Slog particije",
+        "STR_DISK_2TB_MBR_ERROR":"Za naprave z več kot 2 TB izberite GPT.",
+        "STR_SHOW_ALL_DEV":"Pokaži vse naprave",
+        "STR_PART_ALIGN_4KB":"Poravnaj particije s 4 KB",
+        "STR_WEB_COMMUNICATION_ERR":"Napaka pri komunikaciji:",
+        "STR_WEB_REMOTE_ABNORMAL":"Napaka pri komunikaciji: Oddaljena napaka",
+        "STR_WEB_REQUEST_TIMEOUT":"Napaka pri komunikaciji: Zahteva je potekla",
+        "STR_WEB_SERVICE_UNAVAILABLE":"Napaka pri komunikaciji: Storitev ni na voljo",
+        "STR_WEB_TOKEN_MISMATCH":"Stanje ozadnega procesa je bilo posodobljeno, poskusite pozneje.",
+        "STR_WEB_SERVICE_BUSY":"Storitev je zasedena, prosimo poskusite kasneje.",
+        "STR_MENU_VTSI_CREATE":"Ustvari datoteko VTSI",
+        "STR_VTSI_CREATE_TIP":"Tokrat ne bo zapisoval na napravo, ampak bo samo ustvaril datoteko VTSI#@Nadaljuj?",
+        "STR_VTSI_CREATE_SUCCESS":"Datoteka VTSI je bila uspešno ustvarjena!#@Za namestitev Ventoya jo lahko zapišete na napravo z uporabo programa Rufus (3.15+).",
+        "STR_VTSI_CREATE_FAILED":"Ustvarjanje datoteke VTSI ni uspelo.",
+        "STR_MENU_PART_RESIZE":"Neuničujoča namestitev",
+        "STR_PART_RESIZE_TIP":"Ventoy bo poskusil z neuničujočo namestitvijo, če je le mogoče. #@Nadaljuj?",
+        "STR_PART_RESIZE_SUCCESS":"Čestitamo!#@Ventoy neuničljiva namestitev je bila uspešno zaključena.",
+        "STR_PART_RESIZE_FAILED":"Neuničljiva namestitev ni uspela, podrobnosti preverite v datoteki log.txt.",
+        "STR_PART_RESIZE_UNSUPPORTED":"Neuničljiva namestitev Ventoy se je ustavila, ker nekateri pogoji niso izpolnjeni. Podrobnosti preverite v datoteki log.txt.",
+        "STR_INSTALL_YES_TIP1":"Opozorilo: Podatki bodo izgubljeni!",
+        "STR_INSTALL_YES_TIP2":"V spodnje besedilno polje vnesite DA, da potrdite, da res želite izvesti novo namestitev namesto nadgradnje.",
+        "STR_PART_VENTOY_FS":"Datotečni sistem za particijo Ventoy",
+        "STR_PART_FS":"Datotečni sistem",
+        "STR_PART_CLUSTER":"Velikost gruče",
+        "STR_PART_CLUSTER_DEFAULT":"Privzeta sistemska vrednost",
+        "STR_DONATE":"Donirajte",
+        "STR_4KN_UNSUPPORTED":"Trenutno Ventoy ne podpira naprav z ločljivostjo 4K.",
+        
+        "STRXXX":""
+    },
     {
         "name":"Turkish (Türkçe)",
         "FontFamily":"Courier New",
@@ -2433,15 +2563,15 @@
         "STR_MENU_PART_CFG":"Konfigurasi Partisi",
         "STR_BTN_OK":"OK",
         "STR_BTN_CANCEL":"Batal",
-        "STR_PRESERVE_SPACE":"Menyisakan sejumlah ruang penyimpanan pada disk di bawah ini",
+        "STR_PRESERVE_SPACE":"Pertahankan sisa ruang penyimpanan pada disk ini",
-        "STR_SPACE_VAL_INVALID":"Nilai sisa ruang tidak benar",
+        "STR_SPACE_VAL_INVALID":"Nilai sisa ruang tidak valid",
         "STR_MENU_CLEAR":"Bersihkan Ventoy",
         "STR_CLEAR_SUCCESS":"Ventoy telah berhasil dihapus pada perangkat ini.",
         "STR_CLEAR_FAILED":"Terjadi kesalahan ketika penghapusan berlangsung. Anda perlu mencabut-pasang ulang USB dan coba lagi. Periksa berkas log.txt untuk detil.",
         "STR_MENU_PART_STYLE":"Model Partisi",
         "STR_DISK_2TB_MBR_ERROR":"Silakan pilih GPT untuk disk yang lebih dari 2TB",
         "STR_SHOW_ALL_DEV":"Tampilkan semua perangkat",
-        "STR_PART_ALIGN_4KB":"Meluruskan dengan partisi 4KB",
+        "STR_PART_ALIGN_4KB":"Mensejajarkan dengan partisi 4KB",
         "STR_WEB_COMMUNICATION_ERR":"Kesalahan komunikasi:",
         "STR_WEB_REMOTE_ABNORMAL":"Kesalahan komunikasi: pengendali bermasalah",
         "STR_WEB_REQUEST_TIMEOUT":"Kesalahan komunikasi: Waktu permintaan habis",
@@ -2459,9 +2589,9 @@
         "STR_PART_RESIZE_UNSUPPORTED":"Pemasangan tanpa merusakkan Ventoy terhenti karena beberapa kondisi yang tidak mendukung. Periksa berkas log.txt untuk detil.",
         "STR_INSTALL_YES_TIP1":"Peringatan: Data akan hilang!",
         "STR_INSTALL_YES_TIP2":"Silakan ketik YES pada kotak tulis di bawah untuk mengonfirmasikan bahwa anda memang yakin melakukan pemasangan baru ketimbang memperbaruinya",
-        "STR_PART_VENTOY_FS":"Berkas Sistem Untuk Partisi Ventoy",
+        "STR_PART_VENTOY_FS":"Sistem Berkas Untuk Partisi Ventoy",
-        "STR_PART_FS":"Berkas Sistem",
+        "STR_PART_FS":"Sistem Berkas",
-        "STR_PART_CLUSTER":"Ukuran Kelompok",
+        "STR_PART_CLUSTER":"Ukuran Kluster",
         "STR_PART_CLUSTER_DEFAULT":"Nilai Standar Sistem",
         "STR_DONATE":"Donasi sukarela",
         "STR_4KN_UNSUPPORTED":"Saat ini Ventoy tidak mendukung perangkat 4K yang asli.",
@@ -2729,71 +2859,6 @@
         
         "STRXXX":""
     },    
-    {
-        "name":"Slovenian (Slovenski)",
-        "FontFamily":"Courier New",
-        "FontSize":16,
-        "Author":"Urajmal",
-        
-        "STR_ERROR":"Napaka",
-        "STR_WARNING":"Opozorilo",
-        "STR_INFO":"Info",
-        "STR_INCORRECT_DIR":"Prosim izberite pravilno pot!",
-        "STR_INCORRECT_TREE_DIR":"Ne zaganjajte tukaj. Prosim prenesite posodobljeno verzijo in jo zaženite.",
-        "STR_DEVICE":"Naprava",
-        "STR_LOCAL_VER":"Ventoy verzija",
-        "STR_DISK_VER":"Ventoy na napravi",
-        "STR_STATUS":"Status - PRIPRAVLJEN",
-        "STR_INSTALL":"Namesti",
-        "STR_UPDATE":"Nadgradi",
-        "STR_UPDATE_TIP":"Varna nadgradnja. ISO datoteke ne bodo spremenjene.#@Nadaljujem?",
-        "STR_INSTALL_TIP":"Ta disk bo formatiran in vsi podatki bodo izbrisani.#@Nadaljujem?",
-        "STR_INSTALL_TIP2":"Ta disk bo formatiran in vsi podatki bodo izbrisani.#@Nadaljujem? (Druga potrditev)",
-        "STR_INSTALL_SUCCESS":"Čestitamo!#@Ventoy je bil uspešno nameščen na napravo.",
-        "STR_INSTALL_FAILED":"Med namestitvijo je prišlo do napake. Iztaknite in ponovno priklopite USB. Preverite log.txt za podrobnosti.",
-        "STR_UPDATE_SUCCESS":"Čestitamo!#@Ventoy na napravi je bil uspešno posodobljen.",
-        "STR_UPDATE_FAILED":"Prišlo je do napake med nadgradnjo. Iztaknite in ponovno priklopite USB. Preverite log.txt za podrobnosti.",
-        "STR_WAIT_PROCESS":"Proces teče, prosimo počakajte, ...",
-        "STR_MENU_OPTION":"Nastavitve",
-        "STR_MENU_SECURE_BOOT":"Podpora Secure Boot",
-        "STR_MENU_PART_CFG":"Konfiguracija particij",
-        "STR_BTN_OK":"Vredu",
-        "STR_BTN_CANCEL":"Prekliči",
-        "STR_PRESERVE_SPACE":"Ohrani nekaj prostora na koncu particije",
-        "STR_SPACE_VAL_INVALID":"Nepravilna vrednost za rezerviran prostor",
-        "STR_MENU_CLEAR":"Odstrani Ventoy",
-        "STR_CLEAR_SUCCESS":"Ventoy je bil uspešno odstranjen.",
-        "STR_CLEAR_FAILED":"Prišlo je do napake pri odstranjevanju Ventoy-a iz diska. Iztaknite in ponovno priklopite USB. Preverite log.txt za podrobnosti.",
-        "STR_MENU_PART_STYLE":"Vrsta particije",
-        "STR_DISK_2TB_MBR_ERROR":"Prosim izberite GPT za particije nad 2TB",
-        "STR_SHOW_ALL_DEV":"Pokaži vse naprave",
-        "STR_PART_ALIGN_4KB":"Poravnaj particije na 4KB",
-        "STR_WEB_COMMUNICATION_ERR":"Napaka v komunikaciji:",
-        "STR_WEB_REMOTE_ABNORMAL":"Napaka v komunikaciji: oddaljena težava",
-        "STR_WEB_REQUEST_TIMEOUT":"Napaka v komunikaciji: čas je potekel",
-        "STR_WEB_SERVICE_UNAVAILABLE":"Napaka v komunikaciji: storitev ni na voljo",
-        "STR_WEB_TOKEN_MISMATCH":"Zahteva storitve je potekla, prosim poskusite kasneje.",
-        "STR_WEB_SERVICE_BUSY":"Storitev je zasedena, prosim poskusite kasneje.",
-        "STR_MENU_VTSI_CREATE":"Ustvari VTSI datoteko",
-        "STR_VTSI_CREATE_TIP":"Spremembe na napravi ne bo, generirala se bo samo VTSI datoteka#@Nadaljujem?",
-        "STR_VTSI_CREATE_SUCCESS":"VTSI datoteka ustvarjena uspešno!#@Uporabi naj se Rufus(3.15+) za zapis na napravo in uspešno zaključeno inštalacijo Ventoy-a.",
-        "STR_VTSI_CREATE_FAILED":"Ustvarjanje VTSI datoteke ni uspelo.",
-        "STR_MENU_PART_RESIZE":"Inštalacija brez brisanja.",
-        "STR_PART_RESIZE_TIP":"Ventoy bo poskusil inštalacijo brez brisanja podatkov. #@Nadaljujem?",
-        "STR_PART_RESIZE_SUCCESS":"Čestitke!#@Ventoy je bil uspešno nameščen.",
-        "STR_PART_RESIZE_FAILED":"Inštalacija ni uspela, preveri log.txt za podrobnosti.",
-        "STR_PART_RESIZE_UNSUPPORTED":"Ventoy je ustavil inštalacijo ker nekateri pogoji niso zadostni. Preveri log.txt a podrobnosti.",
-        "STR_INSTALL_YES_TIP1":"Pozor: Podatki bodo izbrisani!",
-        "STR_INSTALL_YES_TIP2":"Prosim vtipkajte YES v spodnje okno da potrdite čisto inštalacijo in ne zgolj nadgradnje.",
-        "STR_PART_VENTOY_FS":"File System For Ventoy Partition",
-        "STR_PART_FS":"File System",
-        "STR_PART_CLUSTER":"Cluster Size",
-        "STR_PART_CLUSTER_DEFAULT":"System Default Value",
-        "STR_DONATE":"Donirajte",
-        "STR_4KN_UNSUPPORTED":"Currently Ventoy does not support 4K native devices.",
-        
-        "STRXXX":""
-    },
     {
         "name":"Bulgarian (Български)",
         "FontFamily":"Segoe",
@@ -3313,6 +3378,71 @@
         "STR_DONATE":"Ахвяраваць",
         "STR_4KN_UNSUPPORTED":"Зараз Ventoy не падтрымлівае ўласныя прылады 4K.",
         
+        "STRXXX":""
+    },
+    {
+        "name":"Malayalam (മലയാളം)",
+        "FontFamily":"Courier New",
+        "FontSize":16,
+        "Author":"SIDDHARTH K P",
+
+        "STR_ERROR":"പിശക്",
+        "STR_WARNING":"മുന്നറിയിപ്പ്",
+        "STR_INFO":"വിവരം",
+        "STR_INCORRECT_DIR":"ദയവായി ശരിയായ ഡയറക്ടറിയിൽ പ്രവർത്തിപ്പിക്കുക!",
+        "STR_INCORRECT_TREE_DIR":"എന്നെ ഇവിടെ പ്രവർത്തിപ്പിക്കരുത്, ദയവായി ഇൻസ്റ്റാളേഷൻ പാക്കേജ് ഡൗൺലോഡ് ചെയ്ത് അവിടെ പ്രവർത്തിപ്പിക്കുക.",
+        "STR_DEVICE":"ഉപകരണം",
+        "STR_LOCAL_VER":"പാക്കേജിലെ വെൻ്റോയ്",
+        "STR_DISK_VER":"ഉപകരണത്തിലെ വെൻ്റോയ്",
+        "STR_STATUS":"നില - തയ്യാറാണ്",
+        "STR_INSTALL":"ഇൻസ്റ്റാൾ ചെയ്യുക",
+        "STR_UPDATE":"അപ്ഡേറ്റ് ചെയ്യുക",
+        "STR_UPDATE_TIP":"അപ്‌ഡേറ്റ് പ്രവർത്തനം സുരക്ഷിതമാണ്, ISO ഫയലുകൾ മാറ്റമില്ലാതെ തുടരും.#@തുടരട്ടേ?",
+        "STR_INSTALL_TIP":"ഡിസ്ക് ഫോർമാറ്റ് ചെയ്യപ്പെടും, എല്ലാ ഡാറ്റയും നഷ്‌ടപ്പെടും.#@തുടരട്ടേ?",
+        "STR_INSTALL_TIP2":"ഡിസ്ക് ഫോർമാറ്റ് ചെയ്യപ്പെടും, എല്ലാ ഡാറ്റയും നഷ്‌ടപ്പെടും.#@തുടരട്ടേ? (ഒന്നുകൂടി ഉറപ്പിക്കുക)",
+        "STR_INSTALL_SUCCESS":"അഭിനന്ദനങ്ങൾ!#@വെൻ്റോയ് ഉപകരണത്തിൽ വിജയകരമായി ഇൻസ്റ്റാൾ ചെയ്തു.",
+        "STR_INSTALL_FAILED":"ഇൻസ്റ്റാളേഷൻ സമയത്ത് ഒരു പിശക് സംഭവിച്ചു. നിങ്ങൾക്ക് യുഎസ്ബി ഉപകരണം വീണ്ടും ഘടിപ്പിച്ച് വീണ്ടും ശ്രമിക്കാവുന്നതാണ്. വിവരങ്ങൾക്കായി log.txt പരിശോധിക്കുക.",
+        "STR_UPDATE_SUCCESS":"അഭിനന്ദനങ്ങൾ!#@വെൻ്റോയ് ഉപകരണത്തിൽ വിജയകരമായി അപ്ഡേറ്റ് ചെയ്തു.",
+        "STR_UPDATE_FAILED":"അപ്‌ഡേറ്റ് ചെയ്യുമ്പോൾ ഒരു പിശക് സംഭവിച്ചു. നിങ്ങൾക്ക് യുഎസ്ബി ഉപകരണം വീണ്ടും ഘടിപ്പിച്ച് വീണ്ടും ശ്രമിക്കാവുന്നതാണ്. വിവരങ്ങൾക്കായി log.txt പരിശോധിക്കുക.",
+        "STR_WAIT_PROCESS":"ഒരു പ്രവർത്തനം പുരോഗമിക്കുന്നു, ദയവായി കാത്തിരിക്കുക...",
+        "STR_MENU_OPTION":"ഓപ്ഷനുകൾ",
+        "STR_MENU_SECURE_BOOT":"സുരക്ഷിത ബൂട്ട് പിന്തുണ",
+        "STR_MENU_PART_CFG":"പാർട്ടീഷൻ കോൺഫിഗറേഷൻ",
+        "STR_BTN_OK":"ശരി",
+        "STR_BTN_CANCEL":"റദ്ദാക്കുക",
+        "STR_PRESERVE_SPACE":"ഡിസ്കിൻ്റെ അവസാനം കുറച്ച് സ്ഥലം ഒഴിച്ചിടുക",
+        "STR_SPACE_VAL_INVALID":"സംവരണം ചെയ്ത സ്ഥലത്തിന് അസാധുവായ മൂല്യം",
+        "STR_MENU_CLEAR":"വെൻ്റോയ് നീക്കംചെയ്യുക",
+        "STR_CLEAR_SUCCESS":"ഉപകരണത്തിൽ നിന്ന് വെൻ്റോയ് വിജയകരമായി നീക്കംചെയ്‌തു.",
+        "STR_CLEAR_FAILED":"ഡിസ്കിൽ നിന്ന് വെൻ്റോയ് നീക്കം ചെയ്യുമ്പോൾ ഒരു പിശക് സംഭവിച്ചു. നിങ്ങൾക്ക് യുഎസ്ബി ഉപകരണം വീണ്ടും ഘടിപ്പിച്ച് വീണ്ടും ശ്രമിക്കാവുന്നതാണ്. വിവരങ്ങൾക്കായി log.txt പരിശോധിക്കുക.",
+        "STR_MENU_PART_STYLE":"പാർട്ടീഷൻ രീതി",
+        "STR_DISK_2TB_MBR_ERROR":"2TB-യിൽ കൂടുതൽ വലുപ്പമുള്ള ഡിസ്കിനായി ദയവായി GPT തിരഞ്ഞെടുക്കുക",
+        "STR_SHOW_ALL_DEV":"എല്ലാ ഉപകരണങ്ങളും കാണിക്കുക",
+        "STR_PART_ALIGN_4KB":"പാർട്ടീഷനുകൾ 4KB ഉപയോഗിച്ച് വിന്യസിക്കുക",
+        "STR_WEB_COMMUNICATION_ERR":"ആശയവിനിമയ പിശക്:",
+        "STR_WEB_REMOTE_ABNORMAL":"ആശയവിനിമയ പിശക്: റിമോട്ട് തകരാറ്",
+        "STR_WEB_REQUEST_TIMEOUT":"ആശയവിനിമയ പിശക്: അഭ്യർത്ഥനയുടെ സമയം കഴിഞ്ഞു",
+        "STR_WEB_SERVICE_UNAVAILABLE":"ആശയവിനിമയ പിശക്: സേവനം ലഭ്യമല്ല",
+        "STR_WEB_TOKEN_MISMATCH":"ഡെമൺ നില അപ്‌ഡേറ്റ് ചെയ്‌തു, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക.",
+        "STR_WEB_SERVICE_BUSY":"സേവനം തിരക്കിലാണ്, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക.",
+        "STR_MENU_VTSI_CREATE":"VTSI ഫയൽ സൃഷ്‌ടിക്കുക",
+        "STR_VTSI_CREATE_TIP":"ഇത് ഇത്തവണ ഉപകരണത്തിലേക്ക് എഴുതുകയില്ല, ഒരു VTSI ഫയൽ മാത്രം സൃഷ്ടിക്കും#@തുടരട്ടേ?",
+        "STR_VTSI_CREATE_SUCCESS":"VTSI ഫയൽ വിജയകരമായി സൃഷ്ടിച്ചു!#@വെൻ്റോയ് ഇൻസ്റ്റാളേഷൻ പൂർത്തിയാക്കുന്നതിന് നിങ്ങൾക്ക് Rufus(3.15+) ഉപയോഗിച്ച് ഇത് ഉപകരണത്തിലേക്ക് എഴുതാം.",
+        "STR_VTSI_CREATE_FAILED":"VTSI ഫയൽ നിർമ്മാണം പരാജയപ്പെട്ടു.",
+        "STR_MENU_PART_RESIZE":"ഡാറ്റാ നഷ്ടപ്പെടാതെയുള്ള ഇൻസ്റ്റാളേഷൻ",
+        "STR_PART_RESIZE_TIP":"സാധ്യമെങ്കിൽ, ഡാറ്റാ നഷ്ടപ്പെടാതെയുള്ള ഇൻസ്റ്റാളേഷൻ വെൻ്റോയ് ശ്രമിക്കും. #@തുടരട്ടേ?",
+        "STR_PART_RESIZE_SUCCESS":"അഭിനന്ദനങ്ങൾ!#@വെൻ്റോയ് ഡാറ്റാ നഷ്ടപ്പെടാതെയുള്ള ഇൻസ്റ്റാളേഷൻ വിജയകരമായി പൂർത്തിയാക്കി.",
+        "STR_PART_RESIZE_FAILED":"ഡാറ്റാ നഷ്ടപ്പെടാതെയുള്ള ഇൻസ്റ്റാളേഷൻ പരാജയപ്പെട്ടു, വിശദാംശങ്ങൾക്കായി log.txt പരിശോധിക്കുക.",
+        "STR_PART_RESIZE_UNSUPPORTED":"ചില വ്യവസ്ഥകൾ പാലിക്കാൻ കഴിയാത്തതിനാൽ വെൻ്റോയ് ഡാറ്റാ നഷ്ടപ്പെടാതെയുള്ള ഇൻസ്റ്റാളേഷൻ നിർത്തി. വിശദാംശങ്ങൾക്കായി log.txt പരിശോധിക്കുക.",
+        "STR_INSTALL_YES_TIP1":"മുന്നറിയിപ്പ്: ഡാറ്റ നഷ്ടപ്പെടും!",
+        "STR_INSTALL_YES_TIP2":"അപ്‌ഗ്രേഡിന് പകരം ഒരു പുതിയ ഇൻസ്റ്റാളേഷൻ നടത്താൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുവെന്ന് സ്ഥിരീകരിക്കുന്നതിന് ദയവായി താഴെയുള്ള ടെക്സ്റ്റ് ബോക്സിൽ YES എന്ന് നൽകുക.",
+        "STR_PART_VENTOY_FS":"വെൻ്റോയ് പാർട്ടീഷനായുള്ള ഫയൽ സിസ്റ്റം",
+        "STR_PART_FS":"ഫയൽ സിസ്റ്റം",
+        "STR_PART_CLUSTER":"ക്ലസ്റ്റർ വലുപ്പം",
+        "STR_PART_CLUSTER_DEFAULT":"സിസ്റ്റം ഡിഫോൾട്ട് മൂല്യം",
+        "STR_DONATE":"സംഭാവന ചെയ്യുക",
+        "STR_4KN_UNSUPPORTED":"നിലവിൽ വെൻ്റോയ് 4K നേറ്റീവ് ഉപകരണങ്ങളെ പിന്തുണയ്ക്കുന്നില്ല.",
+    
         "STRXXX":""
     }
 ]

LinuxGUI/Ventoy2Disk/ventoy_gui.c

@@ -1221,6 +1221,7 @@ int real_main(int argc, char **argv)
     int ret;
     int euid;
     char *exe = NULL;
+    const char *env = NULL;
     char path[PATH_MAX];
     char curpath[PATH_MAX];
 
@@ -1270,6 +1271,18 @@ int real_main(int argc, char **argv)
             return 1;
         }
 
+        if (strstr(path, "gtk"))
+        {
+            env = getenv("XDG_SESSION_TYPE");
+            vlog("=== XDG_SESSION_TYPE is <%s> ===\n", env ? env : "NULL");
+            
+            if (env && strncasecmp(env, "wayland", 7) == 0)
+            {
+                vlog("Force GDK_BACKEND from %s to x11 for better compatibility\n", env);
+                setenv("GDK_BACKEND", "x11", 1);
+            }
+        }
+
         if (euid == 0)
         {
             vlog("We have root privileges, just exec %s\n", path);

Plugson/www/index.html

@@ -777,10 +777,10 @@
     <script src="/static/js/jQuery-2.1.4.min.js"></script>
     <!-- jquery validate -->
     <script src="/static/js/jquery.validate.min.js"></script>    
-    <script src="/static/js/jquery.validate.vtoymethods.js?v=192"></script>
+    <script src="/static/js/jquery.validate.vtoymethods.js?v=253"></script>
 
-    <script src="/static/js/jquery.vtoy.alert.js?v=192"></script>
+    <script src="/static/js/jquery.vtoy.alert.js?v=253"></script>
-    <script src="/static/js/vtoy.js?v=192"></script>
+    <script src="/static/js/vtoy.js?v=253"></script>
     <script src="/static/js/md5.min.js"></script>
 
     <!-- Bootstrap 3.3.5 -->

Plugson/www/plugson_auto_install.html

@@ -101,6 +101,10 @@
       timeouten: timeouten,
       autoselen: autoselen
     }, function(e) {
+
+      let data = m_data_autoins[current_tab_index][index];
+      data.timeout = timeoutval;
+      data.autosel = autoselval;
       Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
     });
   }
@@ -224,6 +228,7 @@
 
       var tdtimeout, timeoutdisable, timeoutval;
       var tdautosel, autoseldisable, autoselval;
+
       if (data[i].timeouten) {
         tdtimeout = '<th style="width:10%;"><input id="id_timeout_en_'+i+'" checked="checked" type="checkbox"/> timeout</th>';
         timeoutval = data[i].timeout;

Plugson/www/plugson_persistence.html

@@ -101,6 +101,9 @@
       timeouten: timeouten,
       autoselen: autoselen
     }, function(e) {
+      let data = m_data_persistence[current_tab_index][index];
+      data.timeout = timeoutval;
+      data.autosel = autoselval;
       Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
     });
   }

Plugson/www/static/js/vtoy.js

@@ -316,6 +316,7 @@ var g_vtoy_cur_language_en =
     "STR_ENABLE": " Enable",
     "STR_ADD": "Add",
     "STR_DEL": "Delete",
+    "STR_DEL_SHORT": "Del",
     "STR_CLEAR": "Clear",
     "STR_STATUS": "Status",
     "STR_DEFAULT": "Default",
@@ -459,6 +460,7 @@ var g_vtoy_cur_language_cn =
     "STR_ENABLE": " 使能",
     "STR_ADD": "新增",
     "STR_DEL": "删除",
+    "STR_DEL_SHORT": "删除",
     "STR_CLEAR": "清除",
     "STR_STATUS": "状态",
     "STR_DEFAULT": "默认",
@@ -1007,7 +1009,7 @@ function VtoyCommonChangeLanguage(newlang) {
         $(this).text(g_vtoy_cur_language.STR_ADD);
     });
     $("span[id=id_span_btn_del]").each(function(){
-        $(this).text(g_vtoy_cur_language.STR_DEL);
+        $(this).text(g_vtoy_cur_language.STR_DEL_SHORT);
     });
 
     $("span[id=id_span_enable]").each(function(){
@@ -1436,7 +1438,7 @@ function ventoy_get_xslg_addbtn(mclass) {
 }
 
 function ventoy_get_xslg_delbtn(mclass) {
-    return '<button class="btn btn-xs btn-lg btn-danger btn-del '+mclass+'"><span class="fa fa-trash">&nbsp;&nbsp;</span><span id="id_span_btn_del">'+g_vtoy_cur_language.STR_DEL+'</span></button>';
+    return '<button class="btn btn-xs btn-lg btn-danger btn-del '+mclass+'"><span class="fa fa-trash">&nbsp;&nbsp;</span><span id="id_span_btn_del">'+g_vtoy_cur_language.STR_DEL_SHORT+'</span></button>';
 }
 
 function ventoy_get_addbtn(mclass) {
@@ -1444,7 +1446,7 @@ function ventoy_get_addbtn(mclass) {
 }
 
 function ventoy_get_delbtn(mclass) {
-    return '<button class="btn btn-danger btn-del '+mclass+'"><span class="fa fa-trash">&nbsp;&nbsp;</span><span id="id_span_btn_del">'+g_vtoy_cur_language.STR_DEL+'</span></button>';
+    return '<button class="btn btn-danger btn-del '+mclass+'"><span class="fa fa-trash">&nbsp;&nbsp;</span><span id="id_span_btn_del">'+g_vtoy_cur_language.STR_DEL_SHORT+'</span></button>';
 }
 
 function ventoy_confirm(title, cb, data1, data2) {

README.md

@@ -12,13 +12,13 @@
 
 <h4 align="left">
 Ventoy is an open source tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files. <br/>
-With ventoy, you don't need to format the disk over and over, just copy the image files to the USB drive and boot them.   
+With Ventoy, you don't need to format the disk over and over, just copy the image files to the USB drive and boot them.   
-You can copy many image files at a time and ventoy will give you a boot menu to select them. <br/> 
+You can copy many image files at a time and Ventoy will give you a boot menu to select them. <br/> 
 You can also browse ISO/WIM/IMG/VHD(x)/EFI files in local disk and boot them.<br/>
 x86 Legacy BIOS, IA32 UEFI, x86_64 UEFI, ARM64 UEFI and MIPS64EL UEFI are supported in the same way.<br/>
 Both MBR and GPT partition style are supported in the same way.<br/>
 Most type of OS supported(Windows/WinPE/Linux/Unix/ChromeOS/Vmware/Xen...) <br/>
-  1200+ ISO files are tested (<a href="https://www.ventoy.net/en/isolist.html">List</a>). 90%+ distros in <a href="https://distrowatch.com/">distrowatch.com</a> supported (<a href="https://www.ventoy.net/en/distrowatch.html">Details</a>). <br/>
+  1300+ ISO files are tested (<a href="https://www.ventoy.net/en/isolist.html">List</a>). 90%+ distros in <a href="https://distrowatch.com/">distrowatch.com</a> supported (<a href="https://www.ventoy.net/en/distrowatch.html">Details</a>). <br/>
 <br/>Official Website: <a href=https://www.ventoy.net>https://www.ventoy.net</a>
 </h4>
 
@@ -27,13 +27,13 @@ Most type of OS supported(Windows/WinPE/Linux/Unix/ChromeOS/Vmware/Xen...) <br/>
 Windows 7, Windows 8, Windows 8.1, Windows 10, Windows 11, Windows Server 2012, Windows Server 2012 R2, Windows Server 2016, Windows Server 2019, Windows Server 2022, Windows Server 2025, WinPE
 
 **Linux**  
-Debian, Ubuntu, CentOS(6/7/8/9), RHEL(6/7/8/9), Deepin, Fedora, Rocky Linux, AlmaLinux, EuroLinux(6/7/8/9), openEuler, OpenAnolis, SLES, openSUSE, MX Linux, Manjaro, Linux Mint, Endless OS, Elementary OS, Solus, Linx, Zorin, antiX, PClinuxOS, Arch, ArcoLinux, ArchLabs, BlackArch, Obarun, Artix Linux, Puppy Linux, Tails, Slax, Kali, Mageia, Slackware, Q4OS, Archman, Gentoo, Pentoo, NixOS, Kylin, openKylin, Ubuntu Kylin, KylinSec, Lubuntu, Xubuntu, Kubuntu, Ubuntu MATE, Ubuntu Budgie, Ubuntu Studio, Bluestar, OpenMandriva, ExTiX, Netrunner, ALT Linux, Nitrux, Peppermint, KDE neon, Linux Lite, Parrot OS, Qubes, Pop OS, ROSA, Void Linux, Star Linux, EndeavourOS, MakuluLinux, Voyager, Feren, ArchBang, LXLE, Knoppix, Calculate Linux, Clear Linux, Pure OS, Oracle Linux, Trident, Septor, Porteus, Devuan, GoboLinux, 4MLinux, Simplicity Linux, Zeroshell, Android-x86, netboot.xyz, Slitaz, SuperGrub2Disk, Proxmox VE, Kaspersky Rescue, SystemRescueCD, MemTest86, MemTest86+, MiniTool Partition Wizard, Parted Magic, veket, Sabayon, Scientific, alpine, ClearOS, CloneZilla, Berry Linux, Trisquel, Ataraxia Linux, Minimal Linux Live, BackBox Linux, Emmabuntüs, ESET SysRescue Live,Nova Linux, AV Linux, RoboLinux, NuTyX, IPFire, SELKS, ZStack, Enso Linux, Security Onion, Network Security Toolkit, Absolute Linux, TinyCore, Springdale Linux, Frost Linux, Shark Linux, LinuxFX, Snail Linux, Astra Linux, Namib Linux, Resilient Linux, Virage Linux, Blackweb Security OS, R-DriveImage, O-O.DiskImage, Macrium, ToOpPy LINUX, GNU Guix, YunoHost, foxclone, siduction, Adelie Linux, Elive, Pardus, CDlinux, AcademiX, Austrumi, Zenwalk, Anarchy, DuZeru, BigLinux, OpenMediaVault, Ubuntu DP, Exe GNU/Linux, 3CX Phone System, KANOTIX, Grml, Karoshi, PrimTux, ArchStrike, CAELinux, Cucumber, Fatdog, ForLEx, Hanthana, Kwort, MiniNo, Redcore, Runtu, Asianux, Clu Linux Live, Uruk, OB2D, BlueOnyx, Finnix, HamoniKR, Parabola, LinHES, LinuxConsole, BEE free, Untangle, Pearl, Thinstation, TurnKey, tuxtrans, Neptune, HefftorLinux, GeckoLinux, Mabox Linux, Zentyal, Maui, Reborn OS, SereneLinux , SkyWave Linux, Kaisen Linux, Regata OS, TROM-Jaro, DRBL Linux, Chalet OS, Chapeau, Desa OS, BlankOn, OpenMamba, Frugalware, Kibojoe Linux, Revenge OS, Tsurugi Linux, Drauger OS, Hash Linux, gNewSense, Ikki Boot, SteamOS, Hyperbola, VyOS, EasyNAS, SuperGamer, Live Raizo, Swift Linux, RebeccaBlackOS, Daphile, CRUX, Univention, Ufficio Zero, Rescuezilla, Phoenix OS, Garuda Linux, Mll, NethServer, OSGeoLive, Easy OS, Volumio, FreedomBox, paldo, UBOS, Recalbox, batocera, Lakka, LibreELEC, Pardus Topluluk, Pinguy, KolibriOS, Elastix, Arya, Omoikane, Omarine, Endian Firewall, Hamara, Rocks Cluster, MorpheusArch, Redo, Slackel, SME Server, APODIO, Smoothwall, Dragora, Linspire, Secure-K OS, Peach OSI, Photon, Plamo, SuperX, Bicom, Ploplinux, HP SPP, LliureX, Freespire, DietPi, BOSS, Webconverger, Lunar, TENS, Source Mage, RancherOS, T2, Vine, Pisi, blackPanther, mAid, Acronis, Active.Boot, AOMEI, Boot.Repair, CAINE, DaRT, EasyUEFI, R-Drive, PrimeOS, Avira Rescue System, bitdefender, Checkra1n Linux, Lenovo Diagnostics, Clover, Bliss-OS, Lenovo BIOS Update, Arcabit Rescue Disk, MiyoLinux, TeLOS, Kerio Control, RED OS, OpenWrt, MocaccinoOS, EasyStartup, Pyabr, Refracta, Eset SysRescue, Linpack Xtreme, Archcraft, NHVBOOT, pearOS, SeaTools, Easy Recovery Essentional, iKuai, StorageCraft SCRE, ZFSBootMenu, TROMjaro, BunsenLabs, Todo en Uno, ChallengerOS, Nobara, Holo, CachyOS, Peux OS, Vanilla OS, ShredOS, paladin, Palen1x, dban, ReviOS, HelenOS, XeroLinux, Tiny 11, chimera linux, CuteFish, DragonOs, Rhino Linux, vanilladpup, crystal, IGELOS, MiniOS, gnoppix, PikaOS, UwUntu, Noble, PocketHandyBox, DiskGenius, ......
+Debian, Ubuntu, CentOS(6/7/8/9/10), RHEL(6/7/8/9/10), Deepin, Fedora, Rocky Linux, AlmaLinux, EuroLinux(6/7/8/9), openEuler, OpenAnolis, SLES, openSUSE, MX Linux, Manjaro, Linux Mint, Endless OS, Elementary OS, Solus, Linx, Zorin, antiX, PClinuxOS, Arch, ArcoLinux, ArchLabs, BlackArch, Obarun, Artix Linux, Puppy Linux, Tails, Slax, Kali, Mageia, Slackware, Q4OS, Archman, Gentoo, Pentoo, NixOS, Kylin, openKylin, Ubuntu Kylin, KylinSec, Lubuntu, Xubuntu, Kubuntu, Ubuntu MATE, Ubuntu Budgie, Ubuntu Studio, Bluestar, OpenMandriva, ExTiX, Netrunner, ALT Linux, Nitrux, Peppermint, KDE neon, Linux Lite, Parrot OS, Qubes, Pop OS, ROSA, Void Linux, Star Linux, EndeavourOS, MakuluLinux, Voyager, Feren, ArchBang, LXLE, Knoppix, Calculate Linux, Clear Linux, Pure OS, Oracle Linux, Trident, Septor, Porteus, Devuan, GoboLinux, 4MLinux, Simplicity Linux, Zeroshell, Android-x86, netboot.xyz, Slitaz, SuperGrub2Disk, Proxmox VE, Kaspersky Rescue, SystemRescueCD, MemTest86, MemTest86+, MiniTool Partition Wizard, Parted Magic, veket, Sabayon, Scientific, alpine, ClearOS, CloneZilla, Berry Linux, Trisquel, Ataraxia Linux, Minimal Linux Live, BackBox Linux, Emmabuntüs, ESET SysRescue Live,Nova Linux, AV Linux, RoboLinux, NuTyX, IPFire, SELKS, ZStack, Enso Linux, Security Onion, Network Security Toolkit, Absolute Linux, TinyCore, Springdale Linux, Frost Linux, Shark Linux, LinuxFX, Snail Linux, Astra Linux, Namib Linux, Resilient Linux, Virage Linux, Blackweb Security OS, R-DriveImage, O-O.DiskImage, Macrium, ToOpPy LINUX, GNU Guix, YunoHost, foxclone, siduction, Adelie Linux, Elive, Pardus, CDlinux, AcademiX, Austrumi, Zenwalk, Anarchy, DuZeru, BigLinux, OpenMediaVault, Ubuntu DP, Exe GNU/Linux, 3CX Phone System, KANOTIX, Grml, Karoshi, PrimTux, ArchStrike, CAELinux, Cucumber, Fatdog, ForLEx, Hanthana, Kwort, MiniNo, Redcore, Runtu, Asianux, Clu Linux Live, Uruk, OB2D, BlueOnyx, Finnix, HamoniKR, Parabola, LinHES, LinuxConsole, BEE free, Untangle, Pearl, Thinstation, TurnKey, tuxtrans, Neptune, HefftorLinux, GeckoLinux, Mabox Linux, Zentyal, Maui, Reborn OS, SereneLinux , SkyWave Linux, Kaisen Linux, Regata OS, TROM-Jaro, DRBL Linux, Chalet OS, Chapeau, Desa OS, BlankOn, OpenMamba, Frugalware, Kibojoe Linux, Revenge OS, Tsurugi Linux, Drauger OS, Hash Linux, gNewSense, Ikki Boot, SteamOS, Hyperbola, VyOS, EasyNAS, SuperGamer, Live Raizo, Swift Linux, RebeccaBlackOS, Daphile, CRUX, Univention, Ufficio Zero, Rescuezilla, Phoenix OS, Garuda Linux, Mll, NethServer, OSGeoLive, Easy OS, Volumio, FreedomBox, paldo, UBOS, Recalbox, batocera, Lakka, LibreELEC, Pardus Topluluk, Pinguy, KolibriOS, Elastix, Arya, Omoikane, Omarine, Endian Firewall, Hamara, Rocks Cluster, MorpheusArch, Redo, Slackel, SME Server, APODIO, Smoothwall, Dragora, Linspire, Secure-K OS, Peach OSI, Photon, Plamo, SuperX, Bicom, Ploplinux, HP SPP, LliureX, Freespire, DietPi, BOSS, Webconverger, Lunar, TENS, Source Mage, RancherOS, T2, Vine, Pisi, blackPanther, mAid, Acronis, Active.Boot, AOMEI, Boot.Repair, CAINE, DaRT, EasyUEFI, R-Drive, PrimeOS, Avira Rescue System, bitdefender, Checkra1n Linux, Lenovo Diagnostics, Clover, Bliss-OS, Lenovo BIOS Update, Arcabit Rescue Disk, MiyoLinux, TeLOS, Kerio Control, RED OS, OpenWrt, MocaccinoOS, EasyStartup, Pyabr, Refracta, Eset SysRescue, Linpack Xtreme, Archcraft, NHVBOOT, pearOS, SeaTools, Easy Recovery Essentional, iKuai, StorageCraft SCRE, ZFSBootMenu, TROMjaro, BunsenLabs, Todo en Uno, ChallengerOS, Nobara, Holo, CachyOS, Peux OS, Vanilla OS, ShredOS, paladin, Palen1x, dban, ReviOS, HelenOS, XeroLinux, Tiny 11, chimera linux, CuteFish, DragonOs, Rhino Linux, vanilladpup, crystal, IGELOS, MiniOS, gnoppix, PikaOS, UwUntu, Noble, PocketHandyBox, DiskGenius, Commodore, Talos, Shebang Linux, hrmpf, Bazzite, ManualLinux, nyarchlinux, ultramarine, TempleOS, bluefin, Damn Small Linux, Kicksecure, SerentiyOS, AerynOS, ......
 
 **Unix**  
 DragonFly, FreeBSD, pfSense, OPNsense, GhostBSD, FreeNAS, TrueNAS, XigmaNAS, FuryBSD, HardenedBSD, MidnightBSD, ClonOS, EmergencyBootKit, helloSystem
 
 **ChromeOS**  
-FydeOS, CloudReady, ChromeOS Flex
+FydeOS, CloudReady, ChromeOS Flex, ThoriumOS
 
 **Other**  
 VMware ESXi, Citrix XenServer, Xen XCP-ng
@@ -63,12 +63,12 @@ A GUI Ventoy plugin configurator. [VentoyPlugson](https://www.ventoy.net/en/plug
 * Windows auto installation supported (1.0.09+)
 * Linux auto installation supported (1.0.09+)
 * Variables Expansion supported for Windows/Linux auto installation script
-* FAT32/exFAT/NTFS/UDF/XFS/Ext2(3)(4) supported for main partition
+* FAT32/exFAT/NTFS/UDF/XFS/Btrfs/Ext2(3)(4) supported for main partition
 * ISO files larger than 4GB supported
 * Menu alias, Menu tip message supported
 * Password protect supported
 * Native boot menu style for Legacy & UEFI
-* Most types of OS supported, 1200+ iso files tested
+* Most types of OS supported, 1300+ iso files tested
 * Linux vDisk boot supported
 * Not only boot but also complete installation process
 * Menu dynamically switchable between List/TreeView mode

Ventoy2Disk/Ventoy2Disk/PhyDrive.c

@@ -2785,6 +2785,40 @@ static BOOL WriteBackupDataToDisk(HANDLE hDrive, UINT64 Offset, BYTE *Data, DWOR
 	return TRUE;
 }
 
+static int DeleteVtoyEFIMountPoint(int PhyDrive)
+{
+    int i = 0;
+	BOOL bRet;
+	CHAR DriveLetters[MAX_PATH] = { 0 };
+	CHAR DriveName[] = "?:\\";
+
+    Log("Try to delete VtoyEFI mount point for PhyDrive %d\n", PhyDrive);
+
+    GetLettersBelongPhyDrive(PhyDrive, DriveLetters, sizeof(DriveLetters));
+
+	if (DriveLetters[0] == 0)
+	{
+		Log("No drive letter was assigned...");
+	}
+	else
+	{
+		// Unmount all mounted volumes that belong to this drive
+		// Do it in reverse so that we always end on the first volume letter
+		for (i = (int)strlen(DriveLetters); i > 0; i--)
+		{
+			DriveName[0] = DriveLetters[i - 1];
+			if (IsVentoyLogicalDrive(DriveName[0]))
+			{
+				Log("%s is ventoy logical drive", DriveName);
+				bRet = DeleteVolumeMountPointA(DriveName);
+				Log("Delete mountpoint %s ret:%u code:%u", DriveName, bRet, LASTERR);
+				break;
+			}
+		}
+	}
+    
+    return 0;
+}
 
 int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
 {
@@ -2874,28 +2908,7 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
 	SetFilePointer(hDrive, 512 * 2040, NULL, FILE_BEGIN);
 	ReadFile(hDrive, ReservedData, sizeof(ReservedData), &dwSize, NULL);
 
-	GetLettersBelongPhyDrive(pPhyDrive->PhyDrive, DriveLetters, sizeof(DriveLetters));
+    DeleteVtoyEFIMountPoint(pPhyDrive->PhyDrive);
-
-	if (DriveLetters[0] == 0)
-	{
-		Log("No drive letter was assigned...");
-	}
-	else
-	{
-		// Unmount all mounted volumes that belong to this drive
-		// Do it in reverse so that we always end on the first volume letter
-		for (i = (int)strlen(DriveLetters); i > 0; i--)
-		{
-			DriveName[0] = DriveLetters[i - 1];
-			if (IsVentoyLogicalDrive(DriveName[0]))
-			{
-				Log("%s is ventoy logical drive", DriveName);
-				bRet = DeleteVolumeMountPointA(DriveName);
-				Log("Delete mountpoint %s ret:%u code:%u", DriveName, bRet, LASTERR);
-				break;
-			}
-		}
-	}
 
 	// It kind of blows, but we have to relinquish access to the physical drive
 	// for VDS to be able to delete the partitions that reside on it...
@@ -3270,6 +3283,9 @@ End:
 			{
 				Log("Change EFI partition attr success");
 				pPhyDrive->Part2GPTAttr = VENTOY_EFI_PART_ATTR;
+
+                Sleep(1000);
+                DeleteVtoyEFIMountPoint(pPhyDrive->PhyDrive);
 			}
 			else
 			{

vtoyjump/vtoyjump/vtoyjump.c

@@ -2214,6 +2214,10 @@ static int Windows11Bypass(const char *isofile, const char MntLetter, UINT8 Chec
         goto End;
     }
 
+    //bugfix: change VTOYEFI partition attribute
+    
+
+
     //Now we really need to bypass windows 11 check. create registry
 
     if (Check)
@@ -2390,6 +2394,45 @@ static int MountVTLRI(CHAR *ImgPath, DWORD PhyDrive)
     return 0;
 }
 
+static BOOL FindVentoyDiskBySig(UINT32 VtoySig, DWORD* pDiskNum)
+{
+    HANDLE Handle;
+    DWORD dwSize = 0;
+    CHAR PhyPath[128];
+    UINT8 SectorBuf[512];
+
+    Log("Find Ventoy Disk by Sig %08x ...", VtoySig);
+
+    for (int DiskNum = 0; DiskNum < 32; DiskNum++)
+    {
+        sprintf_s(PhyPath, sizeof(PhyPath), "\\\\.\\PhysicalDrive%d", DiskNum);
+        Handle = CreateFileA(PhyPath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0);
+        if (Handle == INVALID_HANDLE_VALUE)
+        {
+            Log("Could not open the disk<%s>, error:%u", PhyPath, GetLastError());
+            continue;
+        }
+
+        if (!ReadFile(Handle, SectorBuf, sizeof(SectorBuf), &dwSize, NULL))
+        {
+            Log("ReadFile failed, dwSize:%u  error:%u", dwSize, GetLastError());
+            CloseHandle(Handle);
+            continue;
+        }
+
+        CloseHandle(Handle);
+
+        if (*(UINT32*)(SectorBuf + 0x1B8) == VtoySig)
+        {
+            Log("%s sig match ...", PhyPath);
+            *pDiskNum = DiskNum;
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
 static int VentoyHook(ventoy_os_param *param)
 {
     int i;
@@ -2476,11 +2519,11 @@ static int VentoyHook(ventoy_os_param *param)
     if (g_os_param_reserved[6] == 1)
     {
         memcpy(&VtoySig, g_os_param_reserved + 7, 4);
-        for (i = 0; i < 5; i++)
+        for (i = 0; i < 3; i++)
         {
             VtoyLetter = 'A';
             Drives = GetLogicalDrives();
-            Log("Logic Drives: 0x%x  VentoySig:%08X", Drives, VtoySig);
+            Log("[%d] Logic Drives: 0x%x  VentoySig:%08X", i, Drives, VtoySig);
 
             while (Drives)
             {
@@ -2489,12 +2532,13 @@ static int VentoyHook(ventoy_os_param *param)
                     memset(UUID, 0, sizeof(UUID));
                     memset(&VtoyDiskExtent, 0, sizeof(VtoyDiskExtent));
                     DiskSig = 0;
+					
                     if (GetPhyDiskUUID(VtoyLetter, UUID, &DiskSig, &VtoyDiskExtent) == 0)
                     {
-                        Log("DiskSig=%08X PartStart=%lld", DiskSig, VtoyDiskExtent.StartingOffset.QuadPart);
+                        Log("[%d] DiskSig=%08X PartStart=%lld", i, DiskSig, VtoyDiskExtent.StartingOffset.QuadPart);
                         if (DiskSig == VtoySig && VtoyDiskExtent.StartingOffset.QuadPart == SIZE_1MB)
                         {
-                            Log("Ventoy Disk Sig match");
+                            Log("Ventoy Disk Sig and offset match");
                             vtoyfind = TRUE;
                             break;
                         }
@@ -2517,6 +2561,13 @@ static int VentoyHook(ventoy_os_param *param)
             }
         }
 
+        if (vtoyfind == FALSE) // vlnk mode Ventoy partition has no letter
+        {
+            Log("Warning: Ventoy partition has no drive letter, assume C: and find by sig");
+            VtoyLetter = 'C';            
+            vtoyfind = FindVentoyDiskBySig(VtoySig, &VtoyDiskExtent.DiskNumber);
+        }
+
         if (vtoyfind == FALSE)
         {
             Log("Failed to find ventoy disk");