1.1.00 release

Per "man 5 cpio", the namesize in the cpio header includes the trailing
NUL byte of the pathname and the pathname is followed by NUL bytes, but
the current implementation ignores the trailing NUL byte when making
the newc header. Although make_header() tries to pad the pathname string,
the padding won't happen when strlen(name) + sizeof(struct newc_head)
is a multiple of 4, and the non-NULL-terminated pathname may lead to
unexpected results.

Assume that a file is created with 'echo -n aaaa > /boot/test12' and
loaded by grub2:

    linux /boot/vmlinuz
    initrd newc:test12:/boot/test12 /boot/initrd

The initrd command eventually invoked grub_initrd_load() and sent
't''e''s''t''1''2' to make_header() to generate the header:

00000070  30 37 30 37 30 31 33 30  31 43 41 30 44 45 30 30  |070701301CA0DE00|
00000080  30 30 38 31 41 34 30 30  30 30 30 33 45 38 30 30  |0081A4000003E800|
00000090  30 30 30 30 36 34 30 30  30 30 30 30 30 31 36 33  |0000640000000163|
000000a0  37 36 45 34 35 32 30 30  30 30 30 30 30 34 30 30  |76E4520000000400|
000000b0  30 30 30 30 30 38 30 30  30 30 30 30 31 33 30 30  |0000080000001300|
000000c0  30 30 30 30 30 30 30 30  30 30 30 30 30 30 30 30  |0000000000000000|
000000d0  30 30 30 30 30 36 30 30  30 30 30 30 30 30 74 65  |00000600000000te|
                                                                  ^namesize
000000e0  73 74 31 32 61 61 61 61  30 37 30 37 30 31 30 30  |st12aaaa07070100|
                   ^^ end of the pathname

Since strlen("test12") + sizeof(struct newc_head) is 116 = 29 * 4,
make_header() didn't pad the pathname, and the file content followed
"test12" immediately. This violates the cpio format and may trigger such
error during linux boot:

    Initramfs unpacking failed: ZSTD-compressed data is trunc

To avoid the potential problems, this commit counts the trailing NUL byte
in when calling make_header() and adjusts the initrd size accordingly.

Now the header becomes

00000070  30 37 30 37 30 31 33 30  31 43 41 30 44 45 30 30  |070701301CA0DE00|
00000080  30 30 38 31 41 34 30 30  30 30 30 33 45 38 30 30  |0081A4000003E800|
00000090  30 30 30 30 36 34 30 30  30 30 30 30 30 31 36 33  |0000640000000163|
000000a0  37 36 45 34 35 32 30 30  30 30 30 30 30 34 30 30  |76E4520000000400|
000000b0  30 30 30 30 30 38 30 30  30 30 30 30 31 33 30 30  |0000080000001300|
000000c0  30 30 30 30 30 30 30 30  30 30 30 30 30 30 30 30  |0000000000000000|
000000d0  30 30 30 30 30 37 30 30  30 30 30 30 30 30 74 65  |00000700000000te|
                                                                  ^namesize
000000e0  73 74 31 32 00 00 00 00  61 61 61 61 30 37 30 37  |st12....aaaa0707|
                      ^^ end of the pathname

Besides the trailing NUL byte, make_header() pads 3 more NUL bytes, and
the user can safely read the pathname without a further check.

To conform to the cpio format, the headers for "TRAILER!!!" are also
adjusted to include the trailing NUL byte, not ignore it.


Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Signed-off-by: Gary Lin <glin@suse.com>
Co-authored-by: Gary Lin <glin@suse.com>

.github/ISSUE_TEMPLATE/issue_template.yml

@@ -21,7 +21,7 @@ body:
     attributes:
       label: Ventoy Version
       description: What version of ventoy are you running?
-      placeholder: 1.0.84
+      placeholder: 1.0.96
     validations:
       required: true
   - type: dropdown

.github/workflows/ci.yml

@@ -12,26 +12,26 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Run docker-compose up
-      run: docker-compose up
-    - uses: actions/upload-artifact@v2
+    - uses: actions/checkout@v3
+    - name: Run docker compose up
+      run: docker compose up
+    - uses: actions/upload-artifact@v3
       with:
         name: ventoy-windows
         path: INSTALL/ventoy-*windows*
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: ventoy-linux
         path: INSTALL/ventoy-*linux*
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: ventoy-livecd
         path: INSTALL/ventoy-*livecd*
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: SHA256SUM
         path: INSTALL/sha256.txt
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: xxx-build-log
         path: DOC/build.log

DMPATCH/Makefile_IBT

@@ -0,0 +1,7 @@
+
+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

@@ -51,7 +51,15 @@ typedef struct ko_param
     unsigned long sym_get_size;
     unsigned long sym_put_addr;
     unsigned long sym_put_size;
-    unsigned long padding[3];
+    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()
@@ -69,23 +77,110 @@ static volatile ko_param g_ko_param =
 };
 
 #if defined(CONFIG_X86_64)
-#define PATCH_OP_POS    3
-#define CODE_MATCH(code, i) \
+#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_POS    2
-#define CODE_MATCH(code, i) \
+#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 void notrace dmpatch_restore_code(unsigned char *opCode)
+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;
 
@@ -93,13 +188,21 @@ static void notrace dmpatch_restore_code(unsigned char *opCode)
     {
         align = (unsigned long)opCode / g_ko_param.pgsize * g_ko_param.pgsize;
         set_mem_rw(align, 1);
-        *opCode = 0x80;
+        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, 
@@ -112,17 +215,40 @@ static int notrace dmpatch_replace_code
     unsigned long align;
     unsigned char *opCode = (unsigned char *)addr;
 
-    vdebug("patch for %s 0x%lx %d\n", desc, addr, (int)size);
+    vdebug("patch for %s style[%d] 0x%lx %d\n", desc, style, addr, (int)size);
 
-    for (i = 0; i < (int)size - 4; i++)
+    for (i = 0; i < (int)size - 8; i++)
     {
-        if (CODE_MATCH(opCode, i) && cnt < MAX_PATCH)
+        if (style == 1)
         {
-            patch[cnt] = opCode + i + PATCH_OP_POS;
-            cnt++;
+            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);
@@ -143,14 +269,285 @@ static int notrace dmpatch_replace_code
     return 0;
 }
 
-static int notrace dmpatch_init(void)
+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 ...\n", g_ko_param.pgsize);
+    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))
     {
@@ -169,42 +566,60 @@ static int notrace dmpatch_init(void)
     reg_kprobe = (kprobe_reg_pf)g_ko_param.reg_kprobe_addr;
     unreg_kprobe = (kprobe_unreg_pf)g_ko_param.unreg_kprobe_addr;
 
-    r = dmpatch_replace_code(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 2, "dm_get_table_device", g_get_patch);
-    if (r)
+    rc = dmpatch_process(g_ko_param.kv_major, g_ko_param.kv_minor, g_ko_param.kv_subminor);
+    if (rc)
     {
-        rc = -EINVAL;
-        goto out;
+        if (g_ko_param.kv_major >= 5)
+        {
+            rc = dmpatch_process(6, 5, 0);
+            if (rc)
+            {
+                rc = dmpatch_process(6, 7, 0);
+            }
+        }
     }
-    vdebug("patch dm_get_table_device success\n");
 
-    r = dmpatch_replace_code(g_ko_param.sym_put_addr, g_ko_param.sym_put_size, 1, "dm_put_table_device", g_put_patch);
-    if (r)
+    if (g_ko_param.ibt == 0x8888)
     {
-        rc = -EINVAL;
-        goto out;
+        dmpatch_ibt_restore(msr);
     }
-    vdebug("patch dm_put_table_device success\n");
 
-    vdebug("#####################################\n");
-    vdebug("######## dm patch success ###########\n");
-    vdebug("#####################################\n");
-
-out:
-
-	return rc;
+    return rc;
 }
 
 static void notrace dmpatch_exit(void)
 {
     int i = 0;
+    u64 msr;
 
-    for (i = 0; i < MAX_PATCH; i++)
+    if (g_ko_param.ibt == 0x8888)
     {
-        dmpatch_restore_code(g_get_patch[i]);
-        dmpatch_restore_code(g_put_patch[i]);
+        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);

DMPATCH/readme.txt

@@ -1,10 +1,12 @@
-1. install ubuntu 21.10
-2. apt-get install build-essential flex libncurses-dev linux-headers-generic linux-source libssl-dev ...... and so on
-3. cp /lib/modules/5.13.0-23-generic/build/Module.symvers ./
-4. /boot/config-5.13.0-23-generic as .config   make oldconfig
+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)

DMPATCH/ubuntu_build.sh

@@ -0,0 +1,65 @@
+#!/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
+

DMSETUP/build.txt

@@ -5,7 +5,7 @@ use an old version of dmsetup
 http://vault.centos.org/5.3/os/SRPMS/device-mapper-1.02.28-2.el5.src.rpm
 https://www.fefe.de/dietlibc/dietlibc-0.34.tar.xz
 
-======== Build Envrioment ======== 
+======== Build Environment ======== 
 build for 32bit, static linked with dietlibc
 1. install centos 6.10 i386 with CentOS-6.10-i386-bin-DVD1.iso
 2. yum install gcc kernel-devel package

DOC/BuildVentoyFromSource.txt

@@ -1,9 +1,9 @@
 
 ==========================================
-1. Compile Enviroment
+1. Compile Environment
 ==========================================
-    My build envrioment is CentOS 7.8 x86_64. So here I first explain how to create the build environment from scratch.
-    Because Ventoy is based on many open source projects, so the environment is important. I suggest you test it on a virtual machine firstly.
+    My build environment is CentOS 7.8 x86_64. So here I first explain how to create the build environment from scratch.
+    Ventoy is based on many open source projects, so the build environment is important. I suggest you first test it on a virtual machine.
 
 1.1 Install CentOS 7.8
     I use CentOS-7-x86_64-Everything-2003.iso and select Minimal install
@@ -21,10 +21,10 @@
 ==========================================
 2. Download Source Code
 ==========================================
-2.1 Download Ventoy source code from github and decompress it. 
+2.1 Download Ventoy source code from GitHub and decompress it. 
     Next I assume that you have unzipped the code into the /home directory (check /home/Ventoy-master/README.md file for the directory layout).
     
-2.2 Download third-part source code and tool
+2.2 Download third-party source code and tool
     
     https://www.fefe.de/dietlibc/dietlibc-0.34.tar.xz                    ===>  /home/Ventoy-master/DOC/dietlibc-0.34.tar.xz
     https://musl.libc.org/releases/musl-1.2.1.tar.gz                     ===>  /home/Ventoy-master/DOC/musl-1.2.1.tar.gz
@@ -34,7 +34,7 @@
     https://codeload.github.com/libfuse/libfuse/zip/fuse-2.9.9           ===>  /home/Ventoy-master/ExFAT/libfuse-fuse-2.9.9.zip
     https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/aarch64-linux-gnu/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz           ===>  /opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz
     https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2020.08-1.tar.bz2 ===> /opt/aarch64--uclibc--stable-2020.08-1.tar.bz2
-    http://ftp.loongnix.cn/toolchain/gcc/release/mips/gcc7/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz ===> /opt/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz    
+    https://github.com/ventoy/vtoytoolchain/releases/download/1.0/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz ===> /opt/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz
     https://github.com/ventoy/musl-cross-make/releases/download/latest/output.tar.bz2 ===> /opt/output.tar.bz2
 
 
@@ -42,7 +42,7 @@
     http://www.tinycorelinux.net/11.x/x86_64/release/distribution_files/corepure64.gz ===> /home/Ventoy-master/LiveCD/ISO/EFI/boot/corepure64.gz
     http://www.tinycorelinux.net/11.x/x86_64/release/distribution_files/modules64.gz ===> /home/Ventoy-master/LiveCD/ISO/EFI/boot/modules64.gz    
 
-2.3 Prepare third-part tools
+2.3 Prepare third-party tools
     cd /home/Ventoy-master/DOC/
     tar xf musl-1.2.1.tar.gz
     cd musl-1.2.1
@@ -54,7 +54,7 @@
     mv /opt/output /opt/mips64el-linux-musl-gcc730
     
 
-2.4 Set PATH envrioment
+2.4 Set PATH environment
     export PATH=$PATH:/opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu/bin:/opt/aarch64--uclibc--stable-2020.08-1/bin:/opt/mips64el-linux-musl-gcc730/bin
     better to add this line to /root/.bashrc and relogin as root
 
@@ -62,21 +62,21 @@
 ==========================================
 3. All in one script
 ==========================================
-    I have made a all_in_one.sh, you can run this script to build and pack ventoy.
+    I have made an all-in-one script `all_in_one.sh`. You can run this script to build and pack ventoy.
     If you want to compile a certain part separately, you can continue to refer to the later chapters of this text.
     
     cd /home/Ventoy-master/INSTALL
     sh all_in_one.sh
 
     It should be noted that:
-    1. Only grub2/EDK2/IPXE will be recompiled in all_in_one.sh. Other part contains the binaries and are few modified, so will no be recompiled everytime.
+    1. Only grub2/EDK2/IPXE will be recompiled in all_in_one.sh. Other parts contain binaries and are rarely modified, so will not be recompiled everytime.
        You can rebuild these parts separately if you want.
        
-    2. some part of Ventoy has 32bit&64bit version (like 4.9 4.10 4.11 follows)
-       all_in_one.sh only build 64bit version of them, if you want to rebuild the 32bit verison. You should create a 32bit CentOS environment and build them.
-       Fortunately these parts are few modified, you only need to build once or you can directly use the binary I have built.
+    2. Some parts of Ventoy have a 32-bit and 64-bit version (like 4.9, 4.10, 4.11 follows)
+       all_in_one.sh only builds the 64bit version of them. If you want to rebuild the 32bit verison, you should create a 32-bit CentOS environment and build them.
+       Fortunately these parts are rarely modified, so you only need to build once or you can directly use the binaries I have built.
 
-    Besides, after a fully compile and pack, you can only build the part you modified (for example grub2) and run ventoy_pack.sh to generate the package.
+    Besides, after a full compile and packaging, you can only build the part you modified (for example grub2) and run ventoy_pack.sh to generate the package.
 
 ==========================================
 4. Build every part of Ventoy
@@ -122,14 +122,14 @@
     After that, copy EXFAT/shared/mkexfatfs         ===> /home/Ventoy-master/INSTALL/tool/mkexfatfs_64
     After that, copy EXFAT/shared/mount.exfat-fuse  ===> /home/Ventoy-master/INSTALL/tool/mount.exfat-fuse_64
 
-    Use the same build step to build exfat-util 32bit in a 32bit CentOS system and get mkexfatfs_32 and mount.exfat-fuse_32
+    Use the same build step to build exfat-util 32-bit in a 32-bit CentOS system and get mkexfatfs_32 and mount.exfat-fuse_32
 
 4.10 == Build vtoy_fuse_iso_64/vtoy_fuse_iso_32 ==
     cd /home/Ventoy-master/FUSEISO
     sh build_libfuse.sh
     sh build.sh
     
-    Use the same build step to build in a 32bit CentOS system and get vtoy_fuse_iso_32
+    Use the same build step to build in a 32-bit CentOS system and get vtoy_fuse_iso_32
    
 4.11 == Build unsquashfs_64/unsquashfs_32 ==
     cd /home/Ventoy-master/SQUASHFS/SRC
@@ -141,7 +141,7 @@
     cd /home/Ventoy-master/SQUASHFS/squashfs-tools-4.4/squashfs-tools
     sh build.sh
     
-    Use the same build step to build in a 32bit CentOS system and get unsquashfs_32
+    Use the same build step to build in a 32-bit CentOS system and get unsquashfs_32
    
 4.12 == Build vblade_64/vblade_32 ==
     cd /home/Ventoy-master/VBLADE/vblade-master

Dockerfile

@@ -1,6 +1,11 @@
 FROM centos:7
 
-RUN yum -y -q install \
+RUN sed -i \
+    -e 's/^mirrorlist/#mirrorlist/' \
+    -e 's/^#baseurl/baseurl/' \
+    -e 's/mirror\.centos\.org/vault.centos.org/' \
+    /etc/yum.repos.d/*.repo && \
+    yum -y -q install \
         libXpm net-tools bzip2 wget vim gcc gcc-c++ samba dos2unix glibc-devel glibc.i686 glibc-devel.i686 \
         mpfr.i686 mpfr-devel.i686 rsync autogen autoconf automake libtool gettext* bison binutils \
         flex device-mapper-devel SDL libpciaccess libusb freetype freetype-devel gnu-free-* qemu-* virt-* \

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

@@ -1491,6 +1491,34 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_procotol(EFI_FILE_PROTOCOL *File, B
     return EFI_SUCCESS;
 }
 
+STATIC BOOLEAN EFIAPI ventoy_replace_name_match(CHAR8 *pReplace, CHAR8 *pName)
+{
+    UINTN Len1, Len2;
+    
+    Len1 = AsciiStrLen(pReplace);
+    Len2 = AsciiStrLen(pName);
+
+    if (Len1 == 0 || Len2 == 0)
+    {
+        return FALSE;
+    }
+
+    if (0 == AsciiStriCmp(pReplace, pName))
+    {
+        return TRUE;
+    }
+
+    if (Len1 > 2 && Len2 > 2)
+    {
+        if ((pReplace[0] != '\\') && (pName[0] == '\\') && (0 == AsciiStriCmp(pReplace, pName + 1)))
+        {
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
 STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
 (
     EFI_FILE_HANDLE This, 
@@ -1534,7 +1562,7 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
         AsciiSPrint(TmpName, sizeof(TmpName), "%s", Name);
         for (j = 0; j < 4; j++)
         {
-            if (0 == AsciiStriCmp(g_file_replace_list[i].old_file_name[j], TmpName))
+            if (ventoy_replace_name_match(g_file_replace_list[i].old_file_name[j], TmpName))
             {
                 g_original_fclose(*New);
                 *New = &g_efi_file_replace.WrapperHandle;

GRUB2/MOD_SRC/grub-2.04/grub-core/Makefile.core.def

@@ -1533,7 +1533,7 @@ module = {
   name = squash4;
   common = fs/squash4.c;
   cflags = '$(CFLAGS_POSIX) -Wno-undef';
-  cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed -I$(srcdir)/lib/minilzo -DMINILZO_HAVE_CONFIG_H';
+  cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed -I$(srcdir)/lib/minilzo -I$(srcdir)/lib/zstd -DMINILZO_HAVE_CONFIG_H';
 };
 
 module = {

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

@@ -260,6 +260,7 @@ grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
       grub_file_t file;
       grub_err_t err;
       unsigned j;
+      int vlnk = 0;
       file = grub_file_open (args[i], GRUB_FILE_TYPE_TO_HASH
 			     | (!uncompress ? GRUB_FILE_TYPE_NO_DECOMPRESS
 				: GRUB_FILE_TYPE_NONE));
@@ -272,6 +273,7 @@ grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
 	  unread++;
 	  continue;
 	}
+      vlnk = file->vlnk;
       err = hash_file (file, hash, result);
       grub_file_close (file);
       if (err)
@@ -288,7 +290,7 @@ grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
 	    grub_printf ("%02x", ((grub_uint8_t *) result)[j]);
         len += grub_snprintf(hashsum + len, sizeof(hashsum) - len, "%02x", ((grub_uint8_t *) result)[j]);
       }
-      grub_printf ("  %s\n", args[i]);
+      grub_printf ("  %s\n", vlnk ? grub_file_get_vlnk(args[i], NULL) : args[i]);
       grub_env_set("VT_LAST_CHECK_SUM", hashsum);
     }
 

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

@@ -25,10 +25,6 @@
 #include <grub/i18n.h>
 #include <grub/normal.h>
 
-typedef const char * (*get_vmenu_title_pf)(const char *vMenu);
-static get_vmenu_title_pf g_pfvmenu_title = NULL;
-
-
 static const struct grub_arg_option options[] =
   {
     {"class", 1, GRUB_ARG_OPTION_REPEATABLE,
@@ -90,8 +86,6 @@ grub_normal_add_menu_entry (int argc, const char **args,
   char *menu_title = NULL;
   char *menu_sourcecode = NULL;
   char *menu_id = NULL;
-  const char *vmenu = NULL;
-  const char *vaddr = NULL;
   struct grub_menu_entry_class *menu_classes = NULL;
 
   grub_menu_t menu;
@@ -151,17 +145,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
       goto fail;
     }
 
-  if (!g_pfvmenu_title) {        
-    vaddr = grub_env_get("VTOY_VMENU_FUNC_ADDR");
-      if (vaddr)
-        g_pfvmenu_title = (get_vmenu_title_pf)(unsigned long)grub_strtoul(vaddr, NULL, 16);
-  }
-
-  if (g_pfvmenu_title && grub_strncmp(args[0], "@VTMENU_", 8) == 0)
-    vmenu = g_pfvmenu_title(args[0] + 1);
-
-  menu_title = grub_strdup (vmenu ? vmenu : args[0]);
- 
+  menu_title = grub_strdup (args[0]);
   if (! menu_title)
     goto fail;
 

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

@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
 #define EXT4_FEATURE_INCOMPAT_64BIT		0x0080
 #define EXT4_FEATURE_INCOMPAT_MMP		0x0100
 #define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
+#define EXT4_FEATURE_INCOMPAT_CSUM_SEED		0x2000
 #define EXT4_FEATURE_INCOMPAT_ENCRYPT          0x10000
 
 /* The set of back-incompatible features this driver DOES support. Add (OR)
@@ -123,9 +124,16 @@ GRUB_MOD_LICENSE ("GPLv3+");
  * mmp:            Not really back-incompatible - was added as such to
  *                 avoid multiple read-write mounts. Safe to ignore for this
  *                 RO driver.
+ * checksum seed:  Not really back-incompatible - was added to allow tools
+ *                 such as tune2fs to change the UUID on a mounted metadata
+ *                 checksummed filesystem. Safe to ignore for now since the
+ *                 driver doesn't support checksum verification. But it must
+ *                 be removed from this list if that support is added later.
+ *
  */
 #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
-				     | EXT4_FEATURE_INCOMPAT_MMP)
+				     | EXT4_FEATURE_INCOMPAT_MMP \
+				     | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
 
 
 #define EXT3_JOURNAL_MAGIC_NUMBER	0xc03b3998U
@@ -723,10 +731,11 @@ grub_ext2_read_symlink (grub_fshelp_node_t node)
   if (! symlink)
     return 0;
 
-  /* If the filesize of the symlink is bigger than
-     60 the symlink is stored in a separate block,
-     otherwise it is stored in the inode.  */
-  if (grub_le_to_cpu32 (diro->inode.size) <= sizeof (diro->inode.symlink))
+  /*
+   * If the filesize of the symlink is equal to or bigger than 60 the symlink
+   * is stored in a separate block, otherwise it is stored in the inode.
+   */
+  if (grub_le_to_cpu32 (diro->inode.size) < sizeof (diro->inode.symlink))
     grub_memcpy (symlink,
 		 diro->inode.symlink,
 		 grub_le_to_cpu32 (diro->inode.size));

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

@@ -889,6 +889,7 @@ grub_ntfs_mount (grub_disk_t disk)
   struct grub_ntfs_bpb bpb;
   struct grub_ntfs_data *data = 0;
   grub_uint32_t spc;
+  grub_uint32_t sectors_per_cluster;
 
   if (!disk)
     goto fail;
@@ -903,14 +904,18 @@ grub_ntfs_mount (grub_disk_t disk)
   if (grub_disk_read (disk, 0, 0, sizeof (bpb), &bpb))
     goto fail;
 
+  sectors_per_cluster = bpb.sectors_per_cluster;
+  if (sectors_per_cluster > 0x80)
+    sectors_per_cluster = 1U << (256U - bpb.sectors_per_cluster);
+
   if (grub_memcmp ((char *) &bpb.oem_name, "NTFS", 4) != 0
-      || bpb.sectors_per_cluster == 0
-      || (bpb.sectors_per_cluster & (bpb.sectors_per_cluster - 1)) != 0
+      || sectors_per_cluster == 0
+      || (sectors_per_cluster & (sectors_per_cluster - 1)) != 0
       || bpb.bytes_per_sector == 0
       || (bpb.bytes_per_sector & (bpb.bytes_per_sector - 1)) != 0)
     goto fail;
 
-  spc = (((grub_uint32_t) bpb.sectors_per_cluster
+  spc = (((grub_uint32_t) sectors_per_cluster
 	  * (grub_uint32_t) grub_le_to_cpu16 (bpb.bytes_per_sector))
 	 >> GRUB_NTFS_BLK_SHR);
   if (spc == 0)

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

@@ -27,6 +27,7 @@
 #include <grub/fshelp.h>
 #include <grub/deflate.h>
 #include <minilzo.h>
+#include <zstd.h>
 
 #include "xz.h"
 #include "xz_stream.h"
@@ -184,6 +185,7 @@ enum
     COMPRESSION_LZO = 3,
     COMPRESSION_XZ = 4,
     COMPRESSION_LZ4 = 5,
+    COMPRESSION_ZSTD = 6,
   };
 
 
@@ -398,6 +400,25 @@ static grub_ssize_t lz4_decompress_wrap(char *inbuf, grub_size_t insize, grub_of
   return len;
 }
 
+static grub_ssize_t zstd_decompress_wrap(char *inbuf, grub_size_t insize, grub_off_t off, 
+    char *outbuf, grub_size_t len, struct grub_squash_data *data)
+{
+  char *udata = NULL;
+  int usize = data->blksz;
+  if (usize < 8192)
+    usize = 8192;
+
+  udata = grub_malloc (usize);
+  if (!udata)
+    return -1;
+  
+  ZSTD_decompress(udata, usize, inbuf, insize);      
+  grub_memcpy(outbuf, udata + off, len);
+  grub_free(udata);
+  
+  return len;
+}
+
 static struct grub_squash_data *
 squash_mount (grub_disk_t disk)
 {
@@ -447,6 +468,9 @@ squash_mount (grub_disk_t disk)
     case grub_cpu_to_le16_compile_time (COMPRESSION_LZ4):
       data->decompress = lz4_decompress_wrap;
       break;
+    case grub_cpu_to_le16_compile_time (COMPRESSION_ZSTD):
+      data->decompress = zstd_decompress_wrap;
+      break;
     case grub_cpu_to_le16_compile_time (COMPRESSION_XZ):
       data->decompress = xz_decompress;
       data->xzbuf = grub_malloc (XZBUFSIZ);
@@ -519,7 +543,7 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir,
       break;
     case grub_cpu_to_le16_compile_time (SQUASH_TYPE_LONG_DIR):
       off = grub_le_to_cpu16 (dir->ino.long_dir.offset);
-      endoff = grub_le_to_cpu16 (dir->ino.long_dir.size) + off - 3;
+      endoff = grub_le_to_cpu32 (dir->ino.long_dir.size) + off - 3;
       chunk = grub_le_to_cpu32 (dir->ino.long_dir.chunk);
       break;
     default:

GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/gui_label.c

@@ -232,6 +232,10 @@ label_set_property (void *vself, const char *name, const char *value)
        }
        else if (grub_strcmp (value, "@VTOY_HOTKEY_TIP@") == 0) {
             value = g_ventoy_hotkey_tip;
+       } else if (value[0] == '@' && value[1] == '@' && value[2]) {
+            value = grub_env_get(value + 2);
+            if (!value)
+                value = " ";
        }
        
 	  self->template = grub_strdup (value);

GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/theme_loader.c

@@ -295,6 +295,8 @@ theme_set_string (grub_gfxmenu_view_t view,
       if (! view->title_text)
         return grub_errno;
     }
+  else if (! grub_strcmp ("ventoy_left_top_color", name))
+      return grub_errno;
   else
     {
       return grub_error (GRUB_ERR_BAD_ARGUMENT,
@@ -732,6 +734,11 @@ read_property (struct parsebuf *p)
                   "%s:%d:%d property value invalid; "
                   "enclose literal values in quotes (\")",
                   p->filename, p->line_num, p->col_num);
+      
+      grub_printf("File: %s\nLine:%d Column:%d\n"
+                  "property value invalid; enclose literal values in quotes (\")\n\n",
+                  p->filename, p->line_num, p->col_num);
+
       goto done;
     }
 

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

@@ -0,0 +1,250 @@
+/* env.c - Environment variables */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/env.h>
+#include <grub/env_private.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+
+/* The initial context.  */
+static struct grub_env_context initial_context;
+
+/* The current context.  */
+struct grub_env_context *grub_current_context = &initial_context;
+
+static grub_env_read_hook_t vtoy_menu_lang_read_hook;
+
+/* Return the hash representation of the string S.  */
+static unsigned int
+grub_env_hashval (const char *s)
+{
+  unsigned int i = 0;
+
+  /* XXX: This can be done much more efficiently.  */
+  while (*s)
+    i += 5 * *(s++);
+
+  return i % HASHSZ;
+}
+
+static struct grub_env_var *
+grub_env_find (const char *name)
+{
+  struct grub_env_var *var;
+  int idx = grub_env_hashval (name);
+
+  /* Look for the variable in the current context.  */
+  for (var = grub_current_context->vars[idx]; var; var = var->next)
+    if (grub_strcmp (var->name, name) == 0)
+      return var;
+
+  return 0;
+}
+
+static void
+grub_env_insert (struct grub_env_context *context,
+		 struct grub_env_var *var)
+{
+  int idx = grub_env_hashval (var->name);
+
+  /* Insert the variable into the hashtable.  */
+  var->prevp = &context->vars[idx];
+  var->next = context->vars[idx];
+  if (var->next)
+    var->next->prevp = &(var->next);
+  context->vars[idx] = var;
+}
+
+static void
+grub_env_remove (struct grub_env_var *var)
+{
+  /* Remove the entry from the variable table.  */
+  *var->prevp = var->next;
+  if (var->next)
+    var->next->prevp = var->prevp;
+}
+
+grub_err_t
+grub_env_set (const char *name, const char *val)
+{
+  struct grub_env_var *var;
+
+  /* If the variable does already exist, just update the variable.  */
+  var = grub_env_find (name);
+  if (var)
+    {
+      char *old = var->value;
+
+      if (var->write_hook)
+	var->value = var->write_hook (var, val);
+      else
+	var->value = grub_strdup (val);
+
+      if (! var->value)
+	{
+	  var->value = old;
+	  return grub_errno;
+	}
+
+      grub_free (old);
+      return GRUB_ERR_NONE;
+    }
+
+  /* The variable does not exist, so create a new one.  */
+  var = grub_zalloc (sizeof (*var));
+  if (! var)
+    return grub_errno;
+
+  var->name = grub_strdup (name);
+  if (! var->name)
+    goto fail;
+
+  var->value = grub_strdup (val);
+  if (! var->value)
+    goto fail;
+
+  grub_env_insert (grub_current_context, var);
+
+  return GRUB_ERR_NONE;
+
+ fail:
+  grub_free (var->name);
+  grub_free (var->value);
+  grub_free (var);
+
+  return grub_errno;
+}
+
+const char *
+grub_env_get (const char *name)
+{
+  struct grub_env_var *var;
+
+  if (name && vtoy_menu_lang_read_hook && grub_strncmp(name, "VTLANG_", 7) == 0)
+    return vtoy_menu_lang_read_hook(NULL, name);
+
+  var = grub_env_find (name);
+  if (! var)
+    return 0;
+
+  if (var->read_hook)
+    return var->read_hook (var, var->value);
+
+  return var->value;
+}
+
+void
+grub_env_unset (const char *name)
+{
+  struct grub_env_var *var;
+
+  var = grub_env_find (name);
+  if (! var)
+    return;
+
+  if (var->read_hook || var->write_hook)
+    {
+      grub_env_set (name, "");
+      return;
+    }
+
+  grub_env_remove (var);
+
+  grub_free (var->name);
+  grub_free (var->value);
+  grub_free (var);
+}
+
+struct grub_env_var *
+grub_env_update_get_sorted (void)
+{
+  struct grub_env_var *sorted_list = 0;
+  int i;
+
+  /* Add variables associated with this context into a sorted list.  */
+  for (i = 0; i < HASHSZ; i++)
+    {
+      struct grub_env_var *var;
+
+      for (var = grub_current_context->vars[i]; var; var = var->next)
+	{
+	  struct grub_env_var *p, **q;
+
+	  for (q = &sorted_list, p = *q; p; q = &((*q)->sorted_next), p = *q)
+	    {
+	      if (grub_strcmp (p->name, var->name) > 0)
+		break;
+	    }
+
+	  var->sorted_next = *q;
+	  *q = var;
+	}
+    }
+
+  return sorted_list;
+}
+
+grub_err_t
+grub_register_variable_hook (const char *name,
+			     grub_env_read_hook_t read_hook,
+			     grub_env_write_hook_t write_hook)
+{
+  struct grub_env_var *var = grub_env_find (name);
+
+  if (! var)
+    {
+      if (grub_env_set (name, "") != GRUB_ERR_NONE)
+	return grub_errno;
+
+      var = grub_env_find (name);
+      /* XXX Insert an assertion?  */
+    }
+
+  var->read_hook = read_hook;
+  var->write_hook = write_hook;
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_register_vtoy_menu_lang_hook(grub_env_read_hook_t read_hook)
+{
+  vtoy_menu_lang_read_hook = read_hook;
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_env_export (const char *name)
+{
+  struct grub_env_var *var;
+
+  var = grub_env_find (name);
+  if (! var)
+    {
+      grub_err_t err;
+      
+      err = grub_env_set (name, "");
+      if (err)
+	return err;
+      var = grub_env_find (name);
+    }    
+  var->global = 1;
+
+  return GRUB_ERR_NONE;
+}

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

@@ -200,7 +200,8 @@ const char *grub_file_get_vlnk(const char *name, int *vlnk)
 
     if (len == g_vtoy_vlnk.srclen && grub_strcmp(name, g_vtoy_vlnk.src) == 0)
     {
-        *vlnk = 1;
+        if (vlnk)
+            *vlnk = 1;
         return g_vtoy_vlnk.dst; 
     }
     
@@ -208,7 +209,8 @@ const char *grub_file_get_vlnk(const char *name, int *vlnk)
     {
         if (node->srclen == len && grub_strcmp(name, node->src) == 0)
         {
-            *vlnk = 1;
+            if (vlnk)
+                *vlnk = 1;
             return node->dst;
         }
         node = node->next;
@@ -340,10 +342,12 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len)
   if (len == 0)
     return 0;
 
-  if (grub_strncmp(file->name, GRUB_MEMFILE_MEM, grub_strlen(GRUB_MEMFILE_MEM)) == 0) {
+  if (file->name) {
+    if (grub_strncmp(file->name, GRUB_MEMFILE_MEM, grub_strlen(GRUB_MEMFILE_MEM)) == 0) {
       grub_memcpy(buf, (grub_uint8_t *)(file->data) + file->offset, len);
       file->offset += len;
       return len;
+    }
   }
   
   read_hook = file->read_hook;

GRUB2/MOD_SRC/grub-2.04/grub-core/lib/syslinux_parse.c

@@ -362,7 +362,8 @@ static grub_err_t
 cmd_append (const char *line, struct syslinux_menu *menu)
 {
   if (!menu->entries)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "kernel without label");
+    return GRUB_ERR_NONE;
+    //return grub_error (GRUB_ERR_BAD_ARGUMENT, "kernel without label");
 
   menu->entries->append = grub_strdup (line);
   if (!menu->entries->append)

GRUB2/MOD_SRC/grub-2.04/grub-core/loader/efi/chainloader.c

@@ -229,10 +229,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
   if (! file)
     goto fail;
 
-  /* Get the root device's device path.  */
-  dev = grub_device_open (0);
-  if (! dev)
-    goto fail;
+  dev = file->device;
 
   if (dev->disk)
     dev_handle = grub_efidisk_get_device_handle (dev->disk);
@@ -257,16 +254,13 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
   if (dev_handle)
     dp = grub_efi_get_device_path (dev_handle);
 
-  if (! dp)
+  if (dp != NULL)
     {
-      grub_error (GRUB_ERR_BAD_DEVICE, "not a valid root device");
-      goto fail;
+      file_path = make_file_path (dp, filename);
+      if (! file_path)
+        goto fail;
     }
 
-  file_path = make_file_path (dp, filename);
-  if (! file_path)
-    goto fail;
-
   //grub_printf ("file path: ");
   //grub_efi_print_device_path (file_path);
 
@@ -390,16 +384,12 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
     }
 
   grub_file_close (file);
-  grub_device_close (dev);
 
   grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
   return 0;
 
  fail:
 
-  if (dev)
-    grub_device_close (dev);
-
   if (file)
     grub_file_close (file);
 

GRUB2/MOD_SRC/grub-2.04/grub-core/loader/i386/linux.c

@@ -88,6 +88,8 @@ static int ventoy_linux_argc = 0;
 static char **ventoy_linux_args = NULL;
 static int ventoy_extra_initrd_num = 0;
 static char *ventoy_extra_initrd_list[256];
+static grub_command_func_t ventoy_linux16_func = NULL;
+static grub_command_func_t ventoy_initrd16_func = NULL;
 static grub_err_t
 grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), int argc, char *argv[]);
 
@@ -667,54 +669,6 @@ static int ventoy_bootopt_hook(int argc, char *argv[])
     return 0;
 }
 
-static grub_err_t
-grub_cmd_set_boot_opt (grub_command_t cmd __attribute__ ((unused)),
-		int argc, char *argv[])
-{
-    int i;
-    const char *vtdebug;
-
-    for (i = 0; i < argc; i++)
-    {
-        ventoy_linux_args[ventoy_linux_argc + (LINUX_MAX_ARGC / 2) ] = grub_strdup(argv[i]);
-        ventoy_linux_argc++;
-    }
-
-    vtdebug = grub_env_get("vtdebug_flag");
-    if (vtdebug && vtdebug[0])
-    {
-        ventoy_debug = 1;
-    }
-
-    if (ventoy_debug) grub_printf("ventoy set boot opt %d\n", ventoy_linux_argc);
-
-    return 0;
-}
-
-static grub_err_t
-grub_cmd_unset_boot_opt (grub_command_t cmd __attribute__ ((unused)),
-		int argc, char *argv[])
-{
-    int i;
-    
-    (void)argc;
-    (void)argv;
-
-    for (i = 0; i < LINUX_MAX_ARGC; i++)
-    {
-        if (ventoy_linux_args[i])
-        {
-            grub_free(ventoy_linux_args[i]);
-        }
-    }
-
-    ventoy_debug = 0;
-    ventoy_linux_argc = 0;
-    ventoy_initrd_called = 0;
-    grub_memset(ventoy_linux_args, 0, sizeof(char *) * LINUX_MAX_ARGC);
-    return 0;
-}
-
 static grub_err_t
 grub_cmd_extra_initrd_append (grub_command_t cmd __attribute__ ((unused)),
 		int argc, char *argv[])
@@ -1576,6 +1530,92 @@ ventoy_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
     return grub_cmd_initrd(cmd, ventoy_extra_initrd_num, ventoy_extra_initrd_list);
 }
 
+static grub_err_t
+grub_cmd_set_boot_opt (grub_command_t cmd __attribute__ ((unused)),
+		int argc, char *argv[])
+{
+    int i;
+    const char *vtdebug;
+    grub_command_t regcmd;
+        
+    for (i = 0; i < argc; i++)
+    {
+        ventoy_linux_args[ventoy_linux_argc + (LINUX_MAX_ARGC / 2) ] = grub_strdup(argv[i]);
+        ventoy_linux_argc++;
+    }
+
+    vtdebug = grub_env_get("vtdebug_flag");
+    if (vtdebug && vtdebug[0])
+    {
+        ventoy_debug = 1;
+    }
+
+    if (ventoy_debug) grub_printf("ventoy set boot opt %d\n", ventoy_linux_argc);
+
+    ventoy_linux16_func = ventoy_initrd16_func = NULL;
+    regcmd = grub_command_find("linux16");
+    if (regcmd)
+    {
+        ventoy_linux16_func = regcmd->func;
+        regcmd->func = grub_cmd_linux;
+    }
+    
+    regcmd = grub_command_find("initrd16");
+    if (regcmd)
+    {
+        ventoy_initrd16_func = regcmd->func;
+        regcmd->func = ventoy_cmd_initrd;
+    }
+
+    return 0;
+}
+
+static grub_err_t
+grub_cmd_unset_boot_opt (grub_command_t cmd __attribute__ ((unused)),
+		int argc, char *argv[])
+{
+    int i;
+    grub_command_t regcmd;
+    
+    (void)argc;
+    (void)argv;
+
+    for (i = 0; i < LINUX_MAX_ARGC; i++)
+    {
+        if (ventoy_linux_args[i])
+        {
+            grub_free(ventoy_linux_args[i]);
+        }
+    }
+
+    ventoy_debug = 0;
+    ventoy_linux_argc = 0;
+    ventoy_initrd_called = 0;
+    grub_memset(ventoy_linux_args, 0, sizeof(char *) * LINUX_MAX_ARGC);
+
+    if (ventoy_linux16_func)
+    {
+        regcmd = grub_command_find("linux16");
+        if (regcmd)
+        {
+            regcmd->func = ventoy_linux16_func;
+        }
+        ventoy_linux16_func = NULL;
+    }
+
+    if (ventoy_initrd16_func)
+    {
+        regcmd = grub_command_find("initrd16");
+        if (regcmd)
+        {
+            regcmd->func = ventoy_initrd16_func;
+        }
+        ventoy_initrd16_func = NULL;
+    }
+    
+    return 0;
+}
+
 
 static grub_command_t cmd_linux, cmd_initrd, cmd_linuxefi, cmd_initrdefi;
 static grub_command_t cmd_set_bootopt, cmd_unset_bootopt, cmd_extra_initrd_append, cmd_extra_initrd_reset;

GRUB2/MOD_SRC/grub-2.04/grub-core/loader/linux.c

@@ -128,11 +128,22 @@ insert_dir (const char *name, struct dir **root,
 	  n->name = grub_strndup (cb, ce - cb);
 	  if (ptr)
 	    {
+	      /*
+	       * Create the substring with the trailing NUL byte
+	       * to be included in the cpio header.
+	       */
+	      char *tmp_name = grub_strndup (name, ce - name);
+	      if (!tmp_name) {
+		grub_free (n->name);
+		grub_free (n);
+		return grub_errno;
+	      }
 	      grub_dprintf ("linux", "Creating directory %s, %s\n", name, ce);
-	      ptr = make_header (ptr, name, ce - name,
+	      ptr = make_header (ptr, tmp_name, ce - name + 1,
 				 040777, 0);
+	      grub_free (tmp_name);
 	    }
-	  size += ALIGN_UP ((ce - (char *) name)
+	  size += ALIGN_UP ((ce - (char *) name + 1)
 			    + sizeof (struct newc_head), 4);
 	  *head = n;
 	  cur = n;
@@ -183,7 +194,7 @@ grub_initrd_init (int argc, char *argv[],
 		}
 	      initrd_ctx->size
 		+= ALIGN_UP (sizeof (struct newc_head)
-			    + grub_strlen (initrd_ctx->components[i].newc_name),
+			    + grub_strlen (initrd_ctx->components[i].newc_name) + 1,
 			     4);
 	      initrd_ctx->size += insert_dir (initrd_ctx->components[i].newc_name,
 					      &root, 0);
@@ -194,7 +205,7 @@ grub_initrd_init (int argc, char *argv[],
       else if (newc)
 	{
 	  initrd_ctx->size += ALIGN_UP (sizeof (struct newc_head)
-					+ sizeof ("TRAILER!!!") - 1, 4);
+					+ sizeof ("TRAILER!!!"), 4);
 	  free_dir (root);
 	  root = 0;
 	  newc = 0;
@@ -217,7 +228,7 @@ grub_initrd_init (int argc, char *argv[],
     {
       initrd_ctx->size = ALIGN_UP (initrd_ctx->size, 4);
       initrd_ctx->size += ALIGN_UP (sizeof (struct newc_head)
-				    + sizeof ("TRAILER!!!") - 1, 4);
+				    + sizeof ("TRAILER!!!"), 4);
       free_dir (root);
       root = 0;
     }
@@ -269,14 +280,14 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx,
 	  ptr += insert_dir (initrd_ctx->components[i].newc_name,
 			     &root, ptr);
 	  ptr = make_header (ptr, initrd_ctx->components[i].newc_name,
-			     grub_strlen (initrd_ctx->components[i].newc_name),
+			     grub_strlen (initrd_ctx->components[i].newc_name) + 1,
 			     0100777,
 			     initrd_ctx->components[i].size);
 	  newc = 1;
 	}
       else if (newc)
 	{
-	  ptr = make_header (ptr, "TRAILER!!!", sizeof ("TRAILER!!!") - 1,
+	  ptr = make_header (ptr, "TRAILER!!!", sizeof ("TRAILER!!!"),
 			     0, 0);
 	  free_dir (root);
 	  root = 0;
@@ -308,7 +319,7 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx,
     {
       grub_memset (ptr, 0, ALIGN_UP_OVERHEAD (cursize, 4));
       ptr += ALIGN_UP_OVERHEAD (cursize, 4);
-      ptr = make_header (ptr, "TRAILER!!!", sizeof ("TRAILER!!!") - 1, 0, 0);
+      ptr = make_header (ptr, "TRAILER!!!", sizeof ("TRAILER!!!"), 0, 0);
     }
   free_dir (root);
   root = 0;

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

@@ -951,12 +951,12 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
             menu_fini ();
             if (g_ventoy_terminal_output == 0)
             {
-                grub_script_execute_sourcecode("terminal_output console");
+                grub_script_execute_sourcecode("vt_push_menu_lang en_US\nterminal_output console");
                 g_ventoy_terminal_output = 1;
             }
             else
             {
-                grub_script_execute_sourcecode("terminal_output gfxterm");
+                grub_script_execute_sourcecode("terminal_output gfxterm\nvt_pop_menu_lang");
                 g_ventoy_terminal_output = 0;
             }
             goto refresh;
@@ -1133,6 +1133,7 @@ show_menu (grub_menu_t menu, int nested, int autobooted)
     
   while (1)
     {
+      int ndown;
       int boot_entry;
       grub_menu_entry_t e;
       int auto_boot;
@@ -1175,6 +1176,16 @@ show_menu (grub_menu_t menu, int nested, int autobooted)
 
       if (2 == e->argc && e->args && e->args[1] && grub_strncmp(e->args[1], "VTOY_RUN_RET", 12) == 0)
         break; 
+      else if (2 == e->argc && e->args && e->args[1] && grub_strncmp(e->args[1], "VTOY_RUN_SET", 12) == 0) {        
+        ndown = (int)grub_strtol(e->args[1] + 12, NULL, 10);
+        while (ndown > 0)
+        {
+            ventoy_menu_push_key(GRUB_TERM_KEY_DOWN);
+            ndown--;
+        }
+        ventoy_menu_push_key('\n');
+        break;         
+      }
     }
 
   return GRUB_ERR_NONE;

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

@@ -115,6 +115,92 @@ int ventoy_str_all_digit(const char *str)
     return 1;
 }
 
+int ventoy_str_all_alnum(const char *str)
+{
+    if (NULL == str || 0 == *str)
+    {
+        return 0;
+    }
+
+    while (*str)
+    {
+        if (!grub_isalnum(*str))
+        {
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
+int ventoy_str_len_alnum(const char *str, int len)
+{
+    int i;
+    int slen;
+    
+    if (NULL == str || 0 == *str)
+    {
+        return 0;
+    }
+
+    slen = grub_strlen(str);
+    if (slen <= len)
+    {
+        return 0;
+    }
+
+    for (i = 0; i < len; i++)
+    {
+        if (!grub_isalnum(str[i]))
+        {
+            return 0;
+        }
+    }
+
+    if (str[len] == 0 || grub_isspace(str[len]))
+    {
+        return 1;
+    }
+
+    return 0;
+}
+
+char * ventoy_str_basename(char *path)
+{
+    char *pos = NULL;
+    
+    pos = grub_strrchr(path, '/');
+    if (pos)
+    {
+        pos++;
+    }
+    else
+    {
+        pos = path;
+    }
+
+    return pos;
+}
+
+int ventoy_str_chrcnt(const char *str, char c)
+{
+    int n = 0;
+    
+    if (str)
+    {
+        while (*str)
+        {
+            if (*str == c)
+            {
+                n++;                
+            }
+            str++;
+        }        
+    }
+
+    return n;
+}
+
 int ventoy_strcmp(const char *pattern, const char *str)
 {
     while (*pattern && *str)
@@ -146,6 +232,14 @@ int ventoy_strncmp (const char *pattern, const char *str, grub_size_t n)
     return (int)(grub_uint8_t)*pattern - (int)(grub_uint8_t)*str;
 }
 
+grub_err_t ventoy_env_int_set(const char *name, int value)
+{
+    char buf[16];
+    
+    grub_snprintf(buf, sizeof(buf), "%d", value);
+    return grub_env_set(name, buf);
+}
+
 void ventoy_debug_dump_guid(const char *prefix, grub_uint8_t *guid)
 {
     int i;
@@ -269,12 +363,130 @@ static int ventoy_hwinfo_init(void)
 
     grub_snprintf(str, sizeof(str), "%ld", (long)(total_mem / VTOY_SIZE_1MB));
     ventoy_env_export("grub_total_ram", str);
-    
+
 #ifdef GRUB_MACHINE_EFI
     ventoy_get_uefi_version(str, sizeof(str));
     ventoy_env_export("grub_uefi_version", str);
+#else
+    ventoy_env_export("grub_uefi_version", "NA");
 #endif
-    
+
+    return 0;
+}
+
+static global_var_cfg g_global_vars[] = 
+{
+    { "gfxmode",            "1024x768",   NULL },
+    { ventoy_left_key,      "5%",         NULL },
+    { ventoy_top_key,       "95%",        NULL },
+    { ventoy_color_key,     "#0000ff",    NULL },
+    { NULL,                 NULL,         NULL }
+};
+
+static const char * ventoy_global_var_read_hook(struct grub_env_var *var, const char *val)
+{
+    int i;
+
+    for (i = 0; g_global_vars[i].name; i++)
+    {
+        if (grub_strcmp(g_global_vars[i].name, var->name) == 0)
+        {
+            return g_global_vars[i].value;
+        }
+    }
+
+    return val;
+}
+
+static char * ventoy_global_var_write_hook(struct grub_env_var *var, const char *val)
+{
+    int i;
+
+    for (i = 0; g_global_vars[i].name; i++)
+    {
+        if (grub_strcmp(g_global_vars[i].name, var->name) == 0)
+        {
+            grub_check_free(g_global_vars[i].value);
+            g_global_vars[i].value = grub_strdup(val);
+            break;
+        }
+    }
+
+    return grub_strdup(val);
+}
+
+int ventoy_global_var_init(void)
+{
+    int i;
+
+    for (i = 0; g_global_vars[i].name; i++)
+    {
+        g_global_vars[i].value = grub_strdup(g_global_vars[i].defval);
+        ventoy_env_export(g_global_vars[i].name, g_global_vars[i].defval);        
+        grub_register_variable_hook(g_global_vars[i].name, ventoy_global_var_read_hook, ventoy_global_var_write_hook);
+    }
+
+    return 0;
+}
+
+static ctrl_var_cfg g_ctrl_vars[] = 
+{
+    { "VTOY_WIN11_BYPASS_CHECK",  1 },
+    { "VTOY_WIN11_BYPASS_NRO",    1 },
+    { "VTOY_LINUX_REMOUNT",       0 },
+    { "VTOY_SECONDARY_BOOT_MENU", 1 },
+    { NULL, 0 }
+};
+
+static const char * ventoy_ctrl_var_read_hook(struct grub_env_var *var, const char *val)
+{
+    int i;
+
+    for (i = 0; g_ctrl_vars[i].name; i++)
+    {
+        if (grub_strcmp(g_ctrl_vars[i].name, var->name) == 0)
+        {
+            return g_ctrl_vars[i].value ? "1" : "0";
+        }
+    }
+
+    return val;
+}
+
+static char * ventoy_ctrl_var_write_hook(struct grub_env_var *var, const char *val)
+{
+    int i;
+
+    for (i = 0; g_ctrl_vars[i].name; i++)
+    {
+        if (grub_strcmp(g_ctrl_vars[i].name, var->name) == 0)
+        {
+            if (val && val[0] == '1' && val[1] == 0)
+            {
+                g_ctrl_vars[i].value = 1;
+                return grub_strdup("1");
+            }
+            else
+            {
+                g_ctrl_vars[i].value = 0;
+                return grub_strdup("0");
+            }
+        }
+    }
+
+    return grub_strdup(val);
+}
+
+int ventoy_ctrl_var_init(void)
+{
+    int i;
+
+    for (i = 0; g_ctrl_vars[i].name; i++)
+    {
+        ventoy_env_export(g_ctrl_vars[i].name, g_ctrl_vars[i].value ? "1" : "0");
+        grub_register_variable_hook(g_ctrl_vars[i].name, ventoy_ctrl_var_read_hook, ventoy_ctrl_var_write_hook);
+    }
+
     return 0;
 }
 

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

@@ -244,6 +244,15 @@ static int ventoy_browser_valid_dirname(const char *name, int len)
         return 0;
     }
 
+    if (g_filt_trash_dir)
+    {
+        if (0 == grub_strncmp(name, ".trash-", 7) ||
+            0 == grub_strcmp(name, ".Trashes"))
+        {
+            return 0;
+        }
+    }
+
     if (name[0] == '$')
     {
         if (0 == grub_strncmp(name, "$RECYCLE.BIN", 12) ||
@@ -392,6 +401,11 @@ static int ventoy_browser_iterate_dir(const char *filename, const struct grub_di
             return 0;
         }
 
+        if (grub_file_is_vlnk_suffix(filename, len))
+        {
+            return 0;
+        }
+
         node = grub_zalloc(sizeof(browser_node));
         if (!node)
         {
@@ -618,13 +632,13 @@ grub_err_t ventoy_cmd_browser_disk(grub_extcmd_context_t ctxt, int argc, char **
     {
         browser_ssprintf(&mbuf, "menuentry \"%-10s [%s]\" --class=\"vtoyret\" VTOY_RET {\n  "
                          "  echo 'return ...' \n}\n", "<--", 
-                         ventoy_get_vmenu_title("VTMENU_BROWER_RETURN"));        
+                         ventoy_get_vmenu_title("VTLANG_BROWER_RETURN"));        
     }
     else
     {
         browser_ssprintf(&mbuf, "menuentry \"[%s]\" --class=\"vtoyret\" VTOY_RET {\n  "
                          "  echo 'return ...' \n}\n", 
-                         ventoy_get_vmenu_title("VTMENU_BROWER_RETURN"));      
+                         ventoy_get_vmenu_title("VTLANG_BROWER_RETURN"));      
     }
 
     grub_disk_dev_iterate(ventoy_browser_iterate_disk, &mbuf);

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

@@ -65,6 +65,7 @@ int g_initrd_img_count = 0;
 int g_valid_initrd_count = 0;
 int g_default_menu_mode = 0;
 int g_filt_dot_underscore_file = 0;
+int g_filt_trash_dir = 1;
 int g_sort_case_sensitive = 0;
 int g_tree_view_menu_style = 0;
 static grub_file_t g_old_file;
@@ -158,6 +159,10 @@ const char *g_menu_prefix[img_type_max] =
     "iso", "wim", "efi", "img", "vhd", "vtoy"
 };
 
+static const char *g_lower_chksum_name[VTOY_CHKSUM_NUM] = { "md5", "sha1", "sha256", "sha512" };
+static int g_lower_chksum_namelen[VTOY_CHKSUM_NUM] = { 3, 4, 6, 6 };
+static int g_chksum_retlen[VTOY_CHKSUM_NUM] = { 32, 40, 64, 128 };
+
 static int g_vtoy_secondary_need_recover = 0;
 
 static int g_vtoy_load_prompt = 0;
@@ -362,6 +367,42 @@ static int ventoy_enum_video_mode(void)
     VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
 
+static int ventoy_pre_parse_data(char *src, int size)
+{
+    char c;
+    char *pos = NULL;
+    char buf[256];
+
+    if (size < 20 || grub_strncmp(src, "ventoy_left_top_color", 21))
+    {
+        return 0;
+    }
+
+    pos = src + 21;
+    while (*pos && *pos != '\r' && *pos != '\n')
+    {
+        pos++;
+    }
+
+    c = *pos;
+    *pos = 0;
+
+    if (grub_strlen(src) > 200)
+    {
+        goto end;
+    }
+
+    grub_snprintf(buf, sizeof(buf), 
+        "regexp -s 1:%s -s 2:%s -s 3:%s \"@([^@]*)@([^@]*)@([^@]*)@\" \"%s\"", 
+        ventoy_left_key, ventoy_top_key, ventoy_color_key, src);
+
+    grub_script_execute_sourcecode(buf);
+
+end:    
+    *pos = c;
+    return 0;    
+}
+
 static grub_file_t ventoy_wrapper_open(grub_file_t rawFile, enum grub_file_type type)
 {
     int len;
@@ -395,6 +436,7 @@ static grub_file_t ventoy_wrapper_open(grub_file_t rawFile, enum grub_file_type
     }
 
     grub_file_read(rawFile, file->data, rawFile->size);
+    ventoy_pre_parse_data((char *)file->data, (int)rawFile->size);
     len = ventoy_fill_data(4096, (char *)file->data + rawFile->size);
 
     g_old_file = rawFile;
@@ -495,6 +537,7 @@ static int ventoy_set_check_result(int ret, const char *msg)
 
     if (ret)
     {
+        grub_cls();
         grub_printf(VTOY_WARNING"\n");
         grub_printf(VTOY_WARNING"\n");
         grub_printf(VTOY_WARNING"\n\n\n");
@@ -502,10 +545,7 @@ static int ventoy_set_check_result(int ret, const char *msg)
         grub_printf("This is NOT a standard Ventoy device and is NOT supported (%d).\n", ret);
         grub_printf("Error message: <%s>\n\n", msg);
         grub_printf("You should follow the instructions in https://www.ventoy.net to use Ventoy.\n");
-        
-        grub_printf("\n\nWill exit after 10 seconds ...... ");
         grub_refresh();
-        grub_sleep(10);
     }
 
     return ret;
@@ -1728,6 +1768,10 @@ static int ventoy_check_vlnk_data(ventoy_vlnk *vlnk, int print, char *dst, int s
                         cur->fs->fs_close(&file);
                         grub_snprintf(dst, size - 1, "(%s)%s", cur->device, vlnk->filepath);
                     }
+                    else
+                    {
+                        grub_errno = 0;
+                    }
                 }
             }
         }
@@ -1857,9 +1901,14 @@ static int ventoy_collect_img_files(const char *filename, const struct grub_dirh
             return 0;
         }
 
-        if (filename[0] == '$' && 0 == grub_strncmp(filename, "$RECYCLE.BIN", 12))
+        if (g_filt_trash_dir)
         {
-            return 0;
+            if (0 == grub_strncmp(filename, ".trash-", 7) ||
+                0 == grub_strcmp(filename, ".Trashes") ||
+                0 == grub_strncmp(filename, "$RECYCLE.BIN", 12))
+            {
+                return 0;
+            }
         }
 
         if (g_plugin_image_list == VENTOY_IMG_WHITE_LIST)
@@ -2079,6 +2128,13 @@ static int ventoy_collect_img_files(const char *filename, const struct grub_dirh
                     img->menu_prefix = "miso";
                 }
             }
+            else if (img_type_img == type)
+            {
+                if (ventoy_plugin_check_memdisk(img->path))
+                {
+                    img->menu_prefix = "mimg";
+                }
+            }
 
             debug("Add %s%s to list %d\n", node->dir, filename, g_ventoy_img_count);
         }
@@ -2348,14 +2404,14 @@ static int ventoy_dynamic_tree_menu(img_iterator_node *node)
                 vtoy_ssprintf(g_tree_script_buf, g_tree_script_pos, 
                               "menuentry \"%-10s [%s]\" --class=\"vtoyret\" VTOY_RET {\n  "
                               "  echo 'return ...' \n"
-                              "}\n", "<--", ventoy_get_vmenu_title("VTMENU_RET_TO_LISTVIEW"));
+                              "}\n", "<--", ventoy_get_vmenu_title("VTLANG_RET_TO_LISTVIEW"));
             }
             else
             {
                 vtoy_ssprintf(g_tree_script_buf, g_tree_script_pos, 
                               "menuentry \"[%s]\" --class=\"vtoyret\" VTOY_RET {\n  "
                               "  echo 'return ...' \n"
-                              "}\n", ventoy_get_vmenu_title("VTMENU_RET_TO_LISTVIEW"));
+                              "}\n", ventoy_get_vmenu_title("VTLANG_RET_TO_LISTVIEW"));
             }
         }
 
@@ -2781,6 +2837,12 @@ static grub_err_t ventoy_cmd_list_img(grub_extcmd_context_t ctxt, int argc, char
     {
         g_filt_dot_underscore_file = 1;
     }
+    
+    strdata = ventoy_get_env("VTOY_FILT_TRASH_DIR");
+    if (strdata && strdata[0] == '0' && strdata[1] == 0)
+    {
+        g_filt_trash_dir = 0;
+    }
 
     strdata = ventoy_get_env("VTOY_SORT_CASE_SENSITIVE");
     if (strdata && strdata[0] == '1' && strdata[1] == 0)
@@ -2936,7 +2998,7 @@ static grub_err_t ventoy_cmd_list_img(grub_extcmd_context_t ctxt, int argc, char
         vtoy_ssprintf(g_list_script_buf, g_list_script_pos, 
                       "menuentry \"%s [%s]\" --class=\"vtoyret\" VTOY_RET {\n  "
                       "  echo 'return ...' \n"
-                      "}\n", "<--", ventoy_get_vmenu_title("VTMENU_RET_TO_TREEVIEW"));
+                      "}\n", "<--", ventoy_get_vmenu_title("VTLANG_RET_TO_TREEVIEW"));
     }
 
     for (cur = g_ventoy_img_list; cur; cur = cur->next)
@@ -3705,27 +3767,29 @@ static grub_err_t ventoy_cmd_sel_auto_install(grub_extcmd_context_t ctxt, int ar
         vtoy_ssprintf(buf, pos, "set timeout=%d\n", node->timeout);        
     }
     
-    vtoy_ssprintf(buf, pos, "menuentry \"@VTMENU_NO_AUTOINS_SCRIPT\" --class=\"sel_auto_install\" {\n"
+    vtoy_ssprintf(buf, pos, "menuentry \"$VTLANG_NO_AUTOINS_SCRIPT\" --class=\"sel_auto_install\" {\n"
                   "  echo %s\n}\n", "");
 
     for (i = 0; i < node->templatenum; i++)
     {
         vtoy_ssprintf(buf, pos, "menuentry \"%s %s\" --class=\"sel_auto_install\" {\n"
                   "  echo \"\"\n}\n",
-                  ventoy_get_vmenu_title("VTMENU_AUTOINS_USE"),
+                  ventoy_get_vmenu_title("VTLANG_AUTOINS_USE"),
                   node->templatepath[i].path);
     }
 
     g_ventoy_menu_esc = 1;
     g_ventoy_suppress_esc = 1;
     g_ventoy_suppress_esc_default = defidx;
-
+    g_ventoy_secondary_menu_on = 1;
+    
     grub_snprintf(configfile, sizeof(configfile), "configfile mem:0x%llx:size:%d", (ulonglong)(ulong)buf, pos);
     grub_script_execute_sourcecode(configfile);
     
     g_ventoy_menu_esc = 0;
     g_ventoy_suppress_esc = 0;
     g_ventoy_suppress_esc_default = 1;
+    g_ventoy_secondary_menu_on = 0;
 
     grub_free(buf);
 
@@ -3812,14 +3876,14 @@ static grub_err_t ventoy_cmd_sel_persistence(grub_extcmd_context_t ctxt, int arg
         vtoy_ssprintf(buf, pos, "set timeout=%d\n", node->timeout);        
     }
 
-    vtoy_ssprintf(buf, pos, "menuentry \"@VTMENU_NO_PERSISTENCE\" --class=\"sel_persistence\" {\n"
+    vtoy_ssprintf(buf, pos, "menuentry \"$VTLANG_NO_PERSIST\" --class=\"sel_persistence\" {\n"
                   "  echo %s\n}\n", "");
     
     for (i = 0; i < node->backendnum; i++)
     {
         vtoy_ssprintf(buf, pos, "menuentry \"%s %s\" --class=\"sel_persistence\" {\n"
                       "  echo \"\"\n}\n",
-                      ventoy_get_vmenu_title("VTMENU_PERSIST_USE"),
+                      ventoy_get_vmenu_title("VTLANG_PERSIST_USE"),
                       node->backendpath[i].path);
         
     }
@@ -3827,13 +3891,15 @@ static grub_err_t ventoy_cmd_sel_persistence(grub_extcmd_context_t ctxt, int arg
     g_ventoy_menu_esc = 1;
     g_ventoy_suppress_esc = 1;
     g_ventoy_suppress_esc_default = defidx;
-    
+    g_ventoy_secondary_menu_on = 1;
+
     grub_snprintf(configfile, sizeof(configfile), "configfile mem:0x%llx:size:%d", (ulonglong)(ulong)buf, pos);
     grub_script_execute_sourcecode(configfile);
     
     g_ventoy_menu_esc = 0;
     g_ventoy_suppress_esc = 0;
     g_ventoy_suppress_esc_default = 1;
+    g_ventoy_secondary_menu_on = 0;
 
     grub_free(buf);
 
@@ -4963,6 +5029,61 @@ int ventoy_load_part_table(const char *diskname)
     return 0;
 }
 
+static void ventoy_prompt_end(void)
+{
+    int op = 0;
+    char c;
+
+    grub_printf("\n\n\n");
+    grub_printf(" 1 --- Exit grub\n");
+    grub_printf(" 2 --- Reboot\n");
+    grub_printf(" 3 --- Shut down\n");
+    grub_printf("Please enter your choice: ");
+    grub_refresh();
+
+    while (1)
+    {
+        c = grub_getkey();
+        if (c >= '1' && c <= '3')
+        {
+            if (op == 0)
+            {
+                op = c - '0';
+                grub_printf("%c", c);
+                grub_refresh();
+            }
+        }
+        else if (c == '\r' || c == '\n')
+        {
+            if (op)
+            {
+                if (op == 1)
+                {
+                    grub_exit();
+                }
+                else if (op == 2)
+                {
+                    grub_reboot();
+                }
+                else if (op == 3)
+                {   
+                    grub_script_execute_sourcecode("halt");
+                }
+            }
+        }
+        else if (c == '\b')
+        {
+            if (op)
+            {
+                op = 0;
+                grub_printf("\rPlease enter your choice:   ");
+                grub_printf("\rPlease enter your choice: ");
+                grub_refresh();
+            }
+        }
+    }
+}
+
 static grub_err_t ventoy_cmd_load_part_table(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     int ret;
@@ -4973,7 +5094,7 @@ static grub_err_t ventoy_cmd_load_part_table(grub_extcmd_context_t ctxt, int arg
     ret = ventoy_load_part_table(args[0]);
     if (ret)
     {
-        grub_exit();            
+        ventoy_prompt_end();
     }
 
     g_ventoy_disk_part_size[0] = ventoy_get_vtoy_partsize(0);
@@ -6060,6 +6181,7 @@ static grub_err_t ventoy_cmd_show_secondary_menu(grub_extcmd_context_t ctxt, int
     }
 
     g_vtoy_secondary_need_recover = 0;
+    grub_env_unset("VTOY_SECOND_EXIT");
     grub_env_unset("VTOY_CHKSUM_FILE_PATH");
 
     env = grub_env_get("VTOY_SECONDARY_TIMEOUT");
@@ -6075,28 +6197,30 @@ static grub_err_t ventoy_cmd_show_secondary_menu(grub_extcmd_context_t ctxt, int
 
     fsize = grub_strtoull(args[2], NULL, 10);
 
-    vtoy_dummy_menuentry(cmd, pos, len, "@VTMENU_NORMAL_MODE", "second_normal"); seldata[n++] = 1;
+    vtoy_dummy_menuentry(cmd, pos, len, "$VTLANG_NORMAL_MODE", "second_normal"); seldata[n++] = 1;
 
     if (grub_strcmp(args[1], "Unix") != 0)
     {
         if (grub_strcmp(args[1], "Windows") == 0)
         {
-            vtoy_dummy_menuentry(cmd, pos, len, "@VTMENU_WIMBOOT_MODE", "second_wimboot"); seldata[n++] = 2;
+            vtoy_dummy_menuentry(cmd, pos, len, "$VTLANG_WIMBOOT_MODE", "second_wimboot"); seldata[n++] = 2;
         }
         else
         {
-            vtoy_dummy_menuentry(cmd, pos, len, "@VTMENU_GRUB2_MODE", "second_grub2"); seldata[n++] = 3;
+            vtoy_dummy_menuentry(cmd, pos, len, "$VTLANG_GRUB2_MODE", "second_grub2"); seldata[n++] = 3;
         }
 
         if (fsize <= VTOY_SIZE_1GB)
         {
-            vtoy_dummy_menuentry(cmd, pos, len, "@VTMENU_MEMDISK_MODE", "second_memdisk"); seldata[n++] = 4;
+            vtoy_dummy_menuentry(cmd, pos, len, "$VTLANG_MEMDISK_MODE", "second_memdisk"); seldata[n++] = 4;
         }
     }
 
-    vtoy_dummy_menuentry(cmd, pos, len, "@VTMENU_FILE_CHKSUM", "second_checksum"); seldata[n++] = 5;
+    vtoy_dummy_menuentry(cmd, pos, len, "$VTLANG_FILE_CHKSUM", "second_checksum"); seldata[n++] = 5;
+    vtoy_dummy_menuentry(cmd, pos, len, "$VTLANG_RETURN_PRV_NOESC", "second_return"); seldata[n++] = 6;
 
     do {
+        grub_errno = GRUB_ERR_NONE;
         g_ventoy_menu_esc = 1;
         g_ventoy_suppress_esc = 1;
         g_ventoy_suppress_esc_default = 0;
@@ -6130,10 +6254,14 @@ static grub_err_t ventoy_cmd_show_secondary_menu(grub_extcmd_context_t ctxt, int
             grub_env_set("VTOY_CHKSUM_FILE_PATH", args[0]);
             grub_script_execute_sourcecode("configfile $vtoy_efi_part/grub/checksum.cfg");
         }
+        else if (select == 6)
+        {
+            grub_env_set("VTOY_SECOND_EXIT", "1");
+        }
     }while (select == 5);
 
     grub_free(cmd);
-    return 0;
+    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
 
 static grub_err_t ventoy_cmd_secondary_recover_mode(grub_extcmd_context_t ctxt, int argc, char **args)
@@ -6195,6 +6323,425 @@ static grub_err_t ventoy_cmd_load_menu_lang(grub_extcmd_context_t ctxt, int argc
     VENTOY_CMD_RETURN(0);
 }
 
+static int ventoy_chksum_pathcmp(int chktype, char *rlpath, char *rdpath)
+{
+    char *pos1 = NULL;
+    char *pos2 = NULL;
+
+    if (chktype == 2)
+    {
+        pos1 = ventoy_str_basename(rlpath);
+        pos2 = ventoy_str_basename(rdpath);
+        return grub_strcmp(pos1, pos2);
+    }
+    else if (chktype == 3 || chktype == 4)
+    {
+        if (grub_strcmp(rlpath, rdpath) == 0 || grub_strcmp(rlpath + 1, rdpath) == 0)
+        {
+            return 0;
+        }
+    }
+    
+    return 1;
+}
+
+static int ventoy_find_checksum
+(
+    grub_file_t file, 
+    const char *uname, 
+    int retlen, 
+    char *path, 
+    int chktype, 
+    char *chksum
+)
+{
+    int ulen;
+    char *pos = NULL;
+    char *pos1 = NULL;
+    char *pos2 = NULL;
+    char *buf = NULL;
+    char *currline = NULL;
+    char *nextline = NULL;
+
+    ulen = (int)grub_strlen(uname);
+
+    /* read file to buffer */
+    buf = grub_malloc(file->size + 4);
+    if (!buf)
+    {
+        return 1;
+    }
+    grub_file_read(file, buf, file->size);
+    buf[file->size] = 0;
+
+    /* parse each line */
+    for (currline = buf; currline; currline = nextline)
+    {
+        nextline = ventoy_get_line(currline);
+        VTOY_SKIP_SPACE(currline);
+
+        if (grub_strncasecmp(currline, uname, ulen) == 0)
+        {
+            pos = grub_strchr(currline, '=');
+            pos1 = grub_strchr(currline, '(');
+            pos2 = grub_strchr(currline, ')');
+            
+            if (pos && pos1 && pos2)
+            {
+                *pos2 = 0;
+                if (ventoy_chksum_pathcmp(chktype, path, pos1 + 1) == 0)
+                {
+                    VTOY_SKIP_SPACE_NEXT(pos, 1);
+                    grub_memcpy(chksum, pos, retlen);
+                    goto end;
+                }
+            }
+        }
+        else if (ventoy_str_len_alnum(currline, retlen))
+        {
+            VTOY_SKIP_SPACE_NEXT_EX(pos, currline, retlen);
+            if (ventoy_chksum_pathcmp(chktype, path, pos) == 0)
+            {
+                grub_memcpy(chksum, currline, retlen);
+                goto end;                        
+            }
+        }
+    }
+
+end:
+    grub_free(buf);
+    return 0;
+}
+
+static int ventoy_check_chkfile(const char *isopart, char *path, const char *lchkname, grub_file_t *pfile)
+{
+    int ret = 0;
+    int cnt = 0;
+    char c = 0;
+    char *pos = NULL;
+    grub_file_t file = NULL;
+
+    file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s%s.%s", isopart, path, lchkname);
+    if (file)
+    {
+        VTOY_GOTO_END(1);
+    }
+
+    cnt = ventoy_str_chrcnt(path, '/');
+    if (cnt > 1)
+    {
+        pos = grub_strrchr(path, '/');
+        c = *pos;
+        *pos = 0;
+
+        file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s%s/VENTOY_CHECKSUM", isopart, path);
+        if (file)
+        {
+            *pos = c;
+            VTOY_GOTO_END(2);
+        }
+        *pos = c;
+    }
+
+    file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s/VENTOY_CHECKSUM", isopart);
+    if (file)
+    {
+        ret = (cnt > 1) ? 3 : 4;
+    }
+
+end:
+
+    if (pfile)
+    {
+        *pfile = file;        
+    }
+    else
+    {
+        check_free(file, grub_file_close);
+    }
+    return ret;
+}
+
+static grub_err_t ventoy_cmd_cmp_checksum(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    int index = 0;
+    int chktype = 0;
+    char *pos = NULL;
+    grub_file_t file = NULL;
+    const char *calc_value = NULL;
+    const char *isopart = NULL;
+    char fchksum[64];
+    char readchk[256] = {0};
+    char filebuf[512] = {0};
+    char uchkname[16];
+
+    (void)ctxt;
+
+    index = (int)grub_strtol(args[0], NULL, 10);
+    if (argc != 2 || index < 0 || index >= VTOY_CHKSUM_NUM)
+    {
+        return 1;
+    }
+
+    grub_strncpy(uchkname, g_lower_chksum_name[index], sizeof(uchkname));
+    ventoy_str_toupper(uchkname);
+    
+    isopart = grub_env_get("vtoy_iso_part");
+    calc_value = grub_env_get("VT_LAST_CHECK_SUM");    
+
+    chktype = ventoy_check_chkfile(isopart, args[1], g_lower_chksum_name[index], &file);
+    if (chktype <= 0)
+    {
+        grub_printf("\n\nNo checksum file found.\n");
+        goto end;
+    }
+
+    if (chktype == 1)
+    {
+        grub_snprintf(fchksum, sizeof(fchksum), ".%s", g_lower_chksum_name[index]);
+        grub_memset(filebuf, 0, sizeof(filebuf));
+        grub_file_read(file, filebuf, 511);
+
+        pos = grub_strchr(filebuf, '=');
+        if (pos)
+        {
+            VTOY_SKIP_SPACE_NEXT(pos, 1);
+            grub_memcpy(readchk, pos, g_chksum_retlen[index]);
+        }
+        else
+        {
+            grub_memcpy(readchk, filebuf, g_chksum_retlen[index]);
+        }
+    }
+    else if (chktype == 3 || chktype == 4)
+    {
+        grub_snprintf(fchksum, sizeof(fchksum), "global VENTOY_CHECKSUM");
+        ventoy_find_checksum(file, uchkname, g_chksum_retlen[index], args[1], chktype, readchk);
+        if (readchk[0] == 0)
+        {
+            grub_printf("\n\n%s value not found in %s.\n", uchkname, fchksum);
+            goto end;
+        }
+    }
+    else
+    {
+        grub_snprintf(fchksum, sizeof(fchksum), "local VENTOY_CHECKSUM");
+        ventoy_find_checksum(file, uchkname, g_chksum_retlen[index], args[1], chktype, readchk);
+        if (readchk[0] == 0)
+        {
+            grub_file_close(file);
+            file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s/VENTOY_CHECKSUM", isopart);
+            if (file)
+            {
+                grub_snprintf(fchksum, sizeof(fchksum), "global VENTOY_CHECKSUM");
+                ventoy_find_checksum(file, uchkname, g_chksum_retlen[index], args[1], 3, readchk);
+                if (readchk[0] == 0)
+                {
+                    grub_printf("\n\n%s value not found in both local and global VENTOY_CHECKSUM.\n", uchkname);
+                    goto end;
+                }
+            }
+        }
+    }
+
+    if (grub_strcasecmp(calc_value, readchk) == 0)
+    {
+        grub_printf("\n\nCheck %s value with %s file.  [ SUCCESS ]\n", uchkname, fchksum);
+    }
+    else
+    {
+        grub_printf("\n\nCheck %s value with %s file.  [ ERROR ]\n", uchkname, fchksum);
+        grub_printf("The %s value in %s file is:\n%s\n", uchkname, fchksum, readchk);
+    }
+
+end:
+    grub_refresh();
+    check_free(file, grub_file_close);
+    VENTOY_CMD_RETURN(0);
+}
+
+static int ventoy_find_all_checksum
+(
+    grub_file_t file, 
+    char *path,
+    int chktype,
+    int exists[VTOY_CHKSUM_NUM],
+    int *ptotexist
+)
+{
+    int i;
+    int ulen;
+    int tot = 0;
+    char c = 0;
+    char *pos = NULL;
+    char *pos1 = NULL;
+    char *pos2 = NULL;
+    char *buf = NULL;
+    char *currline = NULL;
+    char *nextline = NULL;
+    const char *uname = NULL;
+
+    tot = *ptotexist;
+
+    /* read file to buffer */
+    buf = grub_malloc(file->size + 4);
+    if (!buf)
+    {
+        return 1;
+    }
+    grub_file_read(file, buf, file->size);
+    buf[file->size] = 0;
+
+    /* parse each line */
+    for (currline = buf; currline; currline = nextline)
+    {
+        nextline = ventoy_get_line(currline);
+        VTOY_SKIP_SPACE(currline);
+
+        for (i = 0; i < VTOY_CHKSUM_NUM; i++)
+        {
+            if (exists[i])
+            {
+                continue;
+            }
+        
+            uname = g_lower_chksum_name[i];
+            ulen = g_lower_chksum_namelen[i];
+
+            if (grub_strncasecmp(currline, uname, ulen) == 0)
+            {
+                pos = grub_strchr(currline, '=');
+                pos1 = grub_strchr(currline, '(');
+                pos2 = grub_strchr(currline, ')');
+                
+                if (pos && pos1 && pos2)
+                {
+                    c = *pos2;
+                    *pos2 = 0;
+                    if (ventoy_chksum_pathcmp(chktype, path, pos1 + 1) == 0)
+                    {
+                        exists[i] = 1;
+                        tot++;
+                    }
+                    *pos2 = c;
+                }
+            }
+            else if (ventoy_str_len_alnum(currline, g_chksum_retlen[i]))
+            {
+                VTOY_SKIP_SPACE_NEXT_EX(pos, currline, g_chksum_retlen[i]);
+                if (ventoy_chksum_pathcmp(chktype, path, pos) == 0)
+                {
+                    exists[i] = 1;
+                    tot++;
+                }
+            }
+
+            if (tot >= VTOY_CHKSUM_NUM)
+            {
+                goto end;
+            }
+        }
+    }
+
+end:
+
+    *ptotexist = tot;
+    grub_free(buf);
+    return 0;
+}
+
+static grub_err_t ventoy_cmd_vtoychksum_exist(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    int i = 0;
+    int cnt = 0;
+    char c = 0;
+    int tip = 0;
+    char *pos = NULL;
+    grub_file_t file = NULL;
+    const char *isopart = NULL;
+    int exists[VTOY_CHKSUM_NUM] = { 0, 0, 0, 0 };
+    int totexist = 0;
+
+    (void)argc;
+    (void)ctxt;
+    
+    isopart = grub_env_get("vtoy_iso_part");
+
+    for (i = 0; i < VTOY_CHKSUM_NUM; i++)
+    {
+        if (ventoy_check_file_exist("%s%s.%s", isopart, args[0], g_lower_chksum_name[i]))
+        {
+            exists[i] = 1;
+            totexist++;
+        }
+    }
+
+    if (totexist == VTOY_CHKSUM_NUM)
+    {
+        goto end;
+    }
+
+    cnt = ventoy_str_chrcnt(args[0], '/');
+    if (cnt > 1)
+    {
+        pos = grub_strrchr(args[0], '/');
+        c = *pos;
+        *pos = 0;
+        file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s%s/VENTOY_CHECKSUM", isopart, args[0]);
+        *pos = c;
+        
+        if (file)
+        {
+            if (tip == 0 && file->size > (32 * VTOY_SIZE_1KB))
+            {
+                tip = 1;
+                grub_printf("Reading checksum file...\n");
+                grub_refresh();
+            }
+        
+            debug("parse local VENTOY_CHECKSUM\n");
+            ventoy_find_all_checksum(file, args[0], 2, exists, &totexist);
+            grub_file_close(file);
+        }
+    }
+
+    if (totexist == VTOY_CHKSUM_NUM)
+    {
+        goto end;
+    }
+
+    file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s/VENTOY_CHECKSUM", isopart);
+    if (file)
+    {
+        if (tip == 0 && file->size > (32 * VTOY_SIZE_1KB))
+        {
+            tip = 1;
+            grub_printf("Reading checksum file...\n");
+            grub_refresh();
+        }
+
+        debug("parse global VENTOY_CHECKSUM\n");
+        ventoy_find_all_checksum(file, args[0], (cnt > 1) ? 3 : 4, exists, &totexist);
+        grub_file_close(file);
+    }
+
+end:
+
+    ventoy_env_int_set("VT_EXIST_MD5", exists[0]);
+    ventoy_env_int_set("VT_EXIST_SHA1", exists[1]);
+    ventoy_env_int_set("VT_EXIST_SHA256", exists[2]);
+    ventoy_env_int_set("VT_EXIST_SHA512", exists[3]);
+
+    VENTOY_CMD_RETURN(0);
+}
+
+
+static const char * ventoy_menu_lang_read_hook(struct grub_env_var *var, const char *val)
+{
+    (void)var;
+    return ventoy_get_vmenu_title(val);
+}
+
 int ventoy_env_init(void)
 {
     int i;
@@ -6202,6 +6749,10 @@ int ventoy_env_init(void)
 
     grub_env_set("vtdebug_flag", "");
 
+    grub_register_vtoy_menu_lang_hook(ventoy_menu_lang_read_hook);
+    ventoy_ctrl_var_init();
+    ventoy_global_var_init();
+
     g_part_list_buf = grub_malloc(VTOY_PART_BUF_LEN);
     g_tree_script_buf = grub_malloc(VTOY_MAX_SCRIPT_BUF);
     g_list_script_buf = grub_malloc(VTOY_MAX_SCRIPT_BUF);
@@ -6241,6 +6792,10 @@ int ventoy_env_init(void)
     grub_env_set("VTOY_VMENU_FUNC_ADDR", buf);
     grub_env_export("VTOY_VMENU_FUNC_ADDR");
 
+    grub_snprintf(buf, sizeof(buf), "%s-%s", GRUB_TARGET_CPU, GRUB_PLATFORM);
+    grub_env_set("grub_cpu_platform", buf);
+    grub_env_export("grub_cpu_platform");
+
     return 0;
 }
 
@@ -6410,6 +6965,11 @@ static cmd_para ventoy_cmds[] =
     { "vt_load_menu_lang", ventoy_cmd_load_menu_lang, 0, NULL, "", "", NULL },
     { "vt_init_menu_lang", ventoy_cmd_init_menu_lang, 0, NULL, "", "", NULL },
     { "vt_cur_menu_lang", ventoy_cmd_cur_menu_lang, 0, NULL, "", "", NULL },
+    { "vt_vtoychksum_exist", ventoy_cmd_vtoychksum_exist, 0, NULL, "", "", NULL },
+    { "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 },
+
 };
 
 int ventoy_register_all_cmd(void)

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

@@ -62,6 +62,8 @@
 
 #define VTOY_WARNING  "!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!"
 
+#define VTOY_CHKSUM_NUM  4
+
 #define VTOY_PLAT_I386_UEFI     0x49413332
 #define VTOY_PLAT_ARM64_UEFI    0x41413634
 #define VTOY_PLAT_X86_64_UEFI   0x55454649
@@ -77,6 +79,10 @@
 #define VTOY_ARCH_CPIO  "ventoy_x86.cpio"
 #endif
 
+#define ventoy_left_key     "VTLE_LFT"
+#define ventoy_top_key      "VTLE_TOP"
+#define ventoy_color_key    "VTLE_CLR"
+
 #define ventoy_varg_4(arg) arg[0], arg[1], arg[2], arg[3]
 #define ventoy_varg_8(arg) arg[0], arg[1], arg[2], arg[3], arg[4], arg[5], arg[6], arg[7]
 
@@ -99,6 +105,28 @@
     }\
 }
 
+#define VTOY_SKIP_SPACE(s) \
+    while (ventoy_isspace(*s)) \
+    {\
+        s++;\
+    }
+
+#define VTOY_SKIP_SPACE_NEXT(s, initial) \
+    s += initial;\
+    while (ventoy_isspace(*s)) \
+    {\
+        s++;\
+    }
+
+#define VTOY_SKIP_SPACE_NEXT_EX(s, base, initial) \
+    s = base + initial;\
+    while (ventoy_isspace(*s)) \
+    {\
+        s++;\
+    }
+
+#define VTOY_GOTO_END(v)  ret = v; goto end
+
 typedef enum VTOY_FILE_FLT
 {
     VTOY_FILE_FLT_ISO = 0, /* .iso */
@@ -611,6 +639,11 @@ typedef struct chk_case_fs_dir
 }chk_case_fs_dir;
 
 int ventoy_str_all_digit(const char *str);
+int ventoy_str_all_alnum(const char *str);
+int ventoy_str_len_alnum(const char *str, int len);
+char * ventoy_str_basename(char *path);
+grub_err_t ventoy_env_int_set(const char *name, int value);
+int ventoy_str_chrcnt(const char *str, char c);
 int ventoy_strcmp(const char *pattern, const char *str);
 int ventoy_strncmp (const char *pattern, const char *str, grub_size_t n);
 void ventoy_fill_os_param(grub_file_t file, ventoy_os_param *param);
@@ -1243,6 +1276,19 @@ typedef struct systemd_menu_ctx
     int len;
 }systemd_menu_ctx;
 
+typedef struct global_var_cfg
+{
+    const char *name;
+    const char *defval;
+    char *value;
+}global_var_cfg;
+
+typedef struct ctrl_var_cfg
+{
+    const char *name;
+    int value;
+}ctrl_var_cfg;
+
 #define vtoy_check_goto_out(p)  if (!p) goto out
 
 extern char *g_tree_script_buf;
@@ -1252,6 +1298,7 @@ extern int g_tree_view_menu_style;
 extern int g_sort_case_sensitive;
 extern int g_wimboot_enable;
 extern int g_filt_dot_underscore_file;
+extern int g_filt_trash_dir;
 extern int g_vtoy_file_flt[VTOY_FILE_FLT_BUTT];
 extern const char *g_menu_class[img_type_max];
 extern char g_iso_path[256];
@@ -1265,6 +1312,10 @@ int ventoy_plugin_load_menu_lang(int init, const char *lang);
 const char *ventoy_get_vmenu_title(const char *vMenu);
 grub_err_t ventoy_cmd_cur_menu_lang(grub_extcmd_context_t ctxt, int argc, char **args);
 extern int ventoy_menu_push_key(int code);
+int ventoy_ctrl_var_init(void);
+int ventoy_global_var_init(void);
+grub_err_t ventoy_cmd_push_menulang(grub_extcmd_context_t ctxt, int argc, char **args);
+grub_err_t ventoy_cmd_pop_menulang(grub_extcmd_context_t ctxt, int argc, char **args);
 
 #endif /* __VENTOY_DEF_H__ */
 

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

@@ -177,10 +177,7 @@ static grub_err_t ventoy_isolinux_initrd_collect(grub_file_t file, const char *p
     {
         nextline = ventoy_get_line(start);
 
-        while (ventoy_isspace(*start))
-        {
-            start++;
-        }
+        VTOY_SKIP_SPACE(start);
 
         offset = 7; // strlen("initrd=") or "INITRD " or "initrd "
         pos = grub_strstr(start, "initrd=");
@@ -438,10 +435,7 @@ static grub_err_t ventoy_grub_cfg_initrd_collect(const char *fileName)
     {
         nextline = ventoy_get_line(start);
 
-        while (ventoy_isspace(*start))
-        {
-            start++;
-        }
+        VTOY_SKIP_SPACE(start);
 
         if (grub_strncmp(start, "initrd", 6) != 0)
         {
@@ -454,10 +448,7 @@ static grub_err_t ventoy_grub_cfg_initrd_collect(const char *fileName)
             start++;
         }
 
-        while (ventoy_isspace(*start))
-        {
-            start++;
-        }
+        VTOY_SKIP_SPACE(start);
 
         if (*start == '"')
         {
@@ -528,10 +519,7 @@ static grub_err_t ventoy_grub_cfg_initrd_collect(const char *fileName)
 
             if (*start == ' ' || *start == '\t')
             {
-                while (ventoy_isspace(*start))
-                {
-                    start++;
-                }
+                VTOY_SKIP_SPACE(start);
             }
             else
             {
@@ -1111,6 +1099,7 @@ static grub_err_t ventoy_linux_locate_initrd(int filt, int *filtcnt)
         if (filtbysize 
             && (NULL == grub_strstr(node->name, "minirt.gz"))
             && (NULL == grub_strstr(node->name, "initrd.xz"))
+            && (NULL == grub_strstr(node->name, "initrd.gz"))
             )
         {
             if (filt > 0 && file->size <= g_ventoy_cpio_size + 2048)
@@ -1813,18 +1802,12 @@ static char *ventoy_systemd_conf_tag(char *buf, const char *tag, int optional)
     for (start = buf; start; start = nextline)
     {
         nextline = ventoy_get_line(start);
-        while (ventoy_isspace(*start))
-        {
-            start++;
-        }
+        VTOY_SKIP_SPACE(start);
 
         if (grub_strncmp(start, tag, taglen) == 0 && (start[taglen] == ' ' || start[taglen] == '\t'))
         {
             start += taglen;
-            while (ventoy_isspace(*start))
-            {
-                start++;
-            } 
+            VTOY_SKIP_SPACE(start); 
             return start;
         }
     }
@@ -2038,10 +2021,7 @@ grub_err_t ventoy_cmd_linux_limine_menu(grub_extcmd_context_t ctxt, int argc, ch
     for (start = filebuf; start; start = nextline)
     {
         nextline = ventoy_get_line(start);
-        while (ventoy_isspace(*start))
-        {
-            start++;
-        }
+        VTOY_SKIP_SPACE(start);
 
         if (start[0] == ':')
         {

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

@@ -35,6 +35,7 @@
 #include <grub/crypto.h>
 #include <grub/time.h>
 #include <grub/font.h>
+#include <grub/video.h>
 #include <grub/ventoy.h>
 #include "ventoy_def.h"
 
@@ -59,11 +60,13 @@ static conf_replace *g_conf_replace_head = NULL;
 static VTOY_JSON *g_menu_lang_json = NULL;
 
 static int g_theme_id = 0;
+static int g_theme_res_fit = 0;
 static int g_theme_num = 0;
 static theme_list *g_theme_head = NULL;
 static int g_theme_random = vtoy_theme_random_boot_second;
 static char g_theme_single_file[256];
 static char g_cur_menu_language[32] = {0};
+static char g_push_menu_language[32] = {0};
 
 static int ventoy_plugin_is_parent(const char *pat, int patlen, const char *isopath)
 {
@@ -377,6 +380,18 @@ static int ventoy_plugin_theme_entry(VTOY_JSON *json, const char *isodisk)
     if (g_theme_num > 0)
     {
         vtoy_json_get_int(json->pstChild, "default_file", &g_theme_id);
+        if (g_theme_id == 0)
+        {
+            vtoy_json_get_int(json->pstChild, "resolution_fit", &g_theme_res_fit);
+            if (g_theme_res_fit != 1)
+            {
+                g_theme_res_fit = 0;
+            }
+
+            grub_snprintf(val, sizeof(val), "%d", g_theme_res_fit);
+            ventoy_env_export("vtoy_res_fit", val);
+        }
+        
         if (g_theme_id > g_theme_num || g_theme_id < 0)
         {
             g_theme_id = 0;
@@ -407,19 +422,19 @@ static int ventoy_plugin_theme_entry(VTOY_JSON *json, const char *isodisk)
     value = vtoy_json_get_string_ex(json->pstChild, "ventoy_left");
     if (value)
     {
-        ventoy_env_export("VTLE_LFT", value);
+        ventoy_env_export(ventoy_left_key, value);
     }
     
     value = vtoy_json_get_string_ex(json->pstChild, "ventoy_top");
     if (value)
     {
-        ventoy_env_export("VTLE_TOP", value);
+        ventoy_env_export(ventoy_top_key, value);
     }
     
     value = vtoy_json_get_string_ex(json->pstChild, "ventoy_color");
     if (value)
     {
-        ventoy_env_export("VTLE_CLR", value);
+        ventoy_env_export(ventoy_color_key, value);
     }
 
     node = vtoy_json_find_item(json->pstChild, JSON_TYPE_ARRAY, "fonts");
@@ -3371,7 +3386,7 @@ grub_err_t ventoy_cmd_select_theme_cfg(grub_extcmd_context_t ctxt, int argc, cha
     }
 
     pos += grub_snprintf(buf + pos, bufsize - pos, 
-            "menuentry '@VTMENU_RETURN_PREVIOUS' --class=vtoyret VTOY_RET {\n"
+            "menuentry \"$VTLANG_RETURN_PREVIOUS\" --class=vtoyret VTOY_RET {\n"
                 "echo 'Return ...'\n"
             "}\n");
 
@@ -3381,13 +3396,19 @@ grub_err_t ventoy_cmd_select_theme_cfg(grub_extcmd_context_t ctxt, int argc, cha
     return 0;
 }
 
+extern char g_ventoy_theme_path[256];
+
 grub_err_t ventoy_cmd_set_theme(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     grub_uint32_t i = 0;
     grub_uint32_t mod = 0;
+    grub_uint32_t theme_num = 0;
     theme_list *node = g_theme_head;
     struct grub_datetime datetime;
-    
+    struct grub_video_mode_info info;
+    char buf[64];
+    char **pThemePath = NULL;
+
     (void)argc;
     (void)args;
     (void)ctxt;
@@ -3417,41 +3438,82 @@ grub_err_t ventoy_cmd_set_theme(grub_extcmd_context_t ctxt, int argc, char **arg
         goto end;
     }
 
-    grub_memset(&datetime, 0, sizeof(datetime));
-    grub_get_datetime(&datetime);
-
-    if (g_theme_random == vtoy_theme_random_boot_second)
+    pThemePath = (char **)grub_zalloc(sizeof(char *) * g_theme_num);
+    if (!pThemePath)
     {
-        grub_divmod32((grub_uint32_t)datetime.second, (grub_uint32_t)g_theme_num, &mod);
-    }
-    else if (g_theme_random == vtoy_theme_random_boot_day)
-    {
-        grub_divmod32((grub_uint32_t)datetime.day, (grub_uint32_t)g_theme_num, &mod);
-    }
-    else if (g_theme_random == vtoy_theme_random_boot_month)
-    {
-        grub_divmod32((grub_uint32_t)datetime.month, (grub_uint32_t)g_theme_num, &mod);
+        goto end;
     }
 
-    debug("%04d/%02d/%02d %02d:%02d:%02d radom:%d mod:%d\n",
-          datetime.year, datetime.month, datetime.day,
-          datetime.hour, datetime.minute, datetime.second,
-          g_theme_random, mod);
-
-    for (i = 0; i < mod && node; i++)
+    if (g_theme_res_fit)
     {
-        node = node->next;
+        if (grub_video_get_info(&info) == GRUB_ERR_NONE)
+        {
+            debug("get video info success %ux%u\n", info.width, info.height);
+            grub_snprintf(buf, sizeof(buf), "%ux%u", info.width, info.height);
+            for (node = g_theme_head; node; node = node->next)
+            {
+                if (grub_strstr(node->theme.path, buf))
+                {
+                    pThemePath[theme_num++] = node->theme.path;
+                }
+            }
+        }
     }
 
-    debug("random theme %s\n", node->theme.path);
-    grub_env_set("theme", node->theme.path);
+    if (theme_num == 0)
+    {
+        for (node = g_theme_head; node; node = node->next)
+        {
+            pThemePath[theme_num++] = node->theme.path;
+        }
+    }
+
+    if (theme_num == 1)
+    {
+        mod = 0;
+        debug("Only 1 theme match, no need to random.\n");
+    }
+    else
+    {
+        grub_memset(&datetime, 0, sizeof(datetime));
+        grub_get_datetime(&datetime);
+
+        if (g_theme_random == vtoy_theme_random_boot_second)
+        {
+            grub_divmod32((grub_uint32_t)datetime.second, theme_num, &mod);
+        }
+        else if (g_theme_random == vtoy_theme_random_boot_day)
+        {
+            grub_divmod32((grub_uint32_t)datetime.day, theme_num, &mod);
+        }
+        else if (g_theme_random == vtoy_theme_random_boot_month)
+        {
+            grub_divmod32((grub_uint32_t)datetime.month, theme_num, &mod);
+        }
+
+        debug("%04d/%02d/%02d %02d:%02d:%02d theme_num:%d mod:%d\n",
+              datetime.year, datetime.month, datetime.day,
+              datetime.hour, datetime.minute, datetime.second,
+              theme_num, mod);
+    }
+
+    if (argc > 0 && grub_strcmp(args[0], "switch") == 0)
+    {
+        grub_snprintf(g_ventoy_theme_path, sizeof(g_ventoy_theme_path), "%s", pThemePath[mod]);        
+    }
+    else
+    {        
+        debug("random theme %s\n", pThemePath[mod]);
+        grub_env_set("theme", pThemePath[mod]);
+    }
+    g_ventoy_menu_refresh = 1;
 
 end:
 
+    grub_check_free(pThemePath);
     VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
 
-extern char g_ventoy_theme_path[256];
 grub_err_t ventoy_cmd_set_theme_path(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     (void)argc;
@@ -3521,11 +3583,11 @@ int ventoy_plugin_load_menu_lang(int init, const char *lang)
 
     if (g_default_menu_mode == 0)
     {
-        grub_snprintf(g_ventoy_hotkey_tip, sizeof(g_ventoy_hotkey_tip), "%s", ventoy_get_vmenu_title("VTMENU_STR_HOTKEY_TREE"));
+        grub_snprintf(g_ventoy_hotkey_tip, sizeof(g_ventoy_hotkey_tip), "%s", ventoy_get_vmenu_title("VTLANG_STR_HOTKEY_TREE"));
     }
     else
     {
-        grub_snprintf(g_ventoy_hotkey_tip, sizeof(g_ventoy_hotkey_tip), "%s", ventoy_get_vmenu_title("VTMENU_STR_HOTKEY_LIST"));
+        grub_snprintf(g_ventoy_hotkey_tip, sizeof(g_ventoy_hotkey_tip), "%s", ventoy_get_vmenu_title("VTLANG_STR_HOTKEY_LIST"));
     }
 
     if (init == 0)
@@ -3563,3 +3625,33 @@ grub_err_t ventoy_cmd_cur_menu_lang(grub_extcmd_context_t ctxt, int argc, char *
     VENTOY_CMD_RETURN(0);
 }
 
+grub_err_t ventoy_cmd_push_menulang(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    (void)argc;
+    (void)ctxt;
+
+    if (g_push_menu_language[0] == 0)
+    {
+        grub_memcpy(g_push_menu_language, g_cur_menu_language, sizeof(g_push_menu_language));
+        ventoy_plugin_load_menu_lang(0, args[0]);
+    }
+
+    VENTOY_CMD_RETURN(0);
+}
+
+grub_err_t ventoy_cmd_pop_menulang(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    (void)argc;
+    (void)ctxt;
+    (void)args;
+
+    if (g_push_menu_language[0])
+    {
+        ventoy_plugin_load_menu_lang(0, g_push_menu_language);
+        g_push_menu_language[0] = 0;
+    }
+
+    VENTOY_CMD_RETURN(0);
+}
+
+

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

@@ -148,9 +148,10 @@ static int ventoy_vhd_patch_path(char *vhdpath, ventoy_patch_vhd *patch1, ventoy
     return 0;
 }
 
-static int ventoy_vhd_read_parttbl(const char *filename, ventoy_gpt_info *gpt, int *index)
+static int ventoy_vhd_read_parttbl(const char *filename, ventoy_gpt_info *gpt, int *index, grub_uint64_t *poffset)
 {
     int i;
+    int find = 0;
     int ret = 1;
     grub_uint64_t start;
     grub_file_t file = NULL;
@@ -183,6 +184,7 @@ static int ventoy_vhd_read_parttbl(const char *filename, ventoy_gpt_info *gpt, i
                 if (start == gpt->PartTbl[i].StartLBA)
                 {
                     *index = i;
+                    find = 1;
                     break;
                 }
             }
@@ -196,11 +198,22 @@ static int ventoy_vhd_read_parttbl(const char *filename, ventoy_gpt_info *gpt, i
             if ((grub_uint32_t)start == gpt->MBR.PartTbl[i].StartSectorId)
             {
                 *index = i;
+                find = 1;
                 break;
             }
         }
     }    
 
+    if (find == 0) // MBR Logical partition
+    {
+        if (file->device->disk->partition->number > 0)
+        {
+            *index = file->device->disk->partition->number;
+            debug("Fall back part number: %d\n", *index);
+        }
+    }
+
+    *poffset = start;
     ret = 0;
 
 end:
@@ -226,7 +239,7 @@ static int ventoy_vhd_patch_disk(const char *vhdpath, ventoy_patch_vhd *patch1,
     else
     {
         gpt = grub_zalloc(sizeof(ventoy_gpt_info));
-        ventoy_vhd_read_parttbl(vhdpath, gpt, &partIndex);
+        ventoy_vhd_read_parttbl(vhdpath, gpt, &partIndex, &offset);
         debug("This is HDD partIndex %d %s\n", partIndex, vhdpath);
     }
 
@@ -249,9 +262,11 @@ static int ventoy_vhd_patch_disk(const char *vhdpath, ventoy_patch_vhd *patch1,
     }
     else
     {
-        offset = gpt->MBR.PartTbl[partIndex].StartSectorId;
+        if (offset == 0)
+        {
+            offset = gpt->MBR.PartTbl[partIndex].StartSectorId;
+        }
         offset *= 512;
-    
         debug("MBR disk signature: %02x%02x%02x%02x Part(%d) offset:%llu\n",
             gpt->MBR.BootCode[0x1b8 + 0], gpt->MBR.BootCode[0x1b8 + 1],
             gpt->MBR.BootCode[0x1b8 + 2], gpt->MBR.BootCode[0x1b8 + 3],
@@ -489,7 +504,7 @@ grub_err_t ventoy_cmd_get_vtoy_type(grub_extcmd_context_t ctxt, int argc, char *
     vhd_footer_t vhdfoot;
     VDIPREHEADER vdihdr;
     char type[16] = {0};
-    ventoy_gpt_info *gpt;
+    ventoy_gpt_info *gpt = NULL;
     
     (void)ctxt;
 

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

@@ -1090,6 +1090,12 @@ static int ventoy_fill_windows_rtdata(void *buf, char *isopath, int dataflag)
     {
         data->windows11_bypass_check = 1;
     }
+    
+    env = grub_env_get("VTOY_WIN11_BYPASS_NRO");
+    if (env && env[0] == '1' && env[1] == 0)
+    {
+        data->windows11_bypass_nro = 1;
+    }
 
     pos = grub_strstr(isopath, "/");
     if (!pos)
@@ -1442,6 +1448,7 @@ grub_err_t ventoy_cmd_sel_winpe_wim(grub_extcmd_context_t ctxt, int argc, char *
         g_ventoy_menu_esc = 1;
         g_ventoy_suppress_esc = 1;
         g_ventoy_suppress_esc_default = 0;
+        g_ventoy_secondary_menu_on = 1;
 
         grub_snprintf(cfgfile, sizeof(cfgfile), "configfile mem:0x%llx:size:%d", (ulonglong)(ulong)cmd, pos);
         grub_script_execute_sourcecode(cfgfile);   
@@ -1449,6 +1456,7 @@ grub_err_t ventoy_cmd_sel_winpe_wim(grub_extcmd_context_t ctxt, int argc, char *
         g_ventoy_menu_esc = 0;
         g_ventoy_suppress_esc = 0;
         g_ventoy_suppress_esc_default = 1;
+        g_ventoy_secondary_menu_on = 0;
 
         for (node = g_wim_patch_head; node; node = node->next)
         {

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

@@ -0,0 +1,73 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003,2005,2006,2007,2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_ENV_HEADER
+#define GRUB_ENV_HEADER	1
+
+#include <grub/symbol.h>
+#include <grub/err.h>
+#include <grub/types.h>
+#include <grub/menu.h>
+
+struct grub_env_var;
+
+typedef const char *(*grub_env_read_hook_t) (struct grub_env_var *var,
+					     const char *val);
+typedef char *(*grub_env_write_hook_t) (struct grub_env_var *var,
+					const char *val);
+
+struct grub_env_var
+{
+  char *name;
+  char *value;
+  grub_env_read_hook_t read_hook;
+  grub_env_write_hook_t write_hook;
+  struct grub_env_var *next;
+  struct grub_env_var **prevp;
+  struct grub_env_var *sorted_next;
+  int global;
+};
+
+grub_err_t EXPORT_FUNC(grub_env_set) (const char *name, const char *val);
+const char *EXPORT_FUNC(grub_env_get) (const char *name);
+void EXPORT_FUNC(grub_env_unset) (const char *name);
+struct grub_env_var *EXPORT_FUNC(grub_env_update_get_sorted) (void);
+
+#define FOR_SORTED_ENV(var) for (var = grub_env_update_get_sorted (); var; var = var->sorted_next)
+
+grub_err_t EXPORT_FUNC(grub_register_variable_hook) (const char *name,
+						     grub_env_read_hook_t read_hook,
+						     grub_env_write_hook_t write_hook);
+grub_err_t EXPORT_FUNC(grub_register_vtoy_menu_lang_hook) (grub_env_read_hook_t read_hook);
+
+grub_err_t grub_env_context_open (void);
+grub_err_t grub_env_context_close (void);
+grub_err_t EXPORT_FUNC(grub_env_export) (const char *name);
+
+void grub_env_unset_menu (void);
+grub_menu_t grub_env_get_menu (void);
+void grub_env_set_menu (grub_menu_t nmenu);
+
+grub_err_t
+grub_env_extractor_open (int source);
+
+grub_err_t
+grub_env_extractor_close (int source);
+
+
+#endif /* ! GRUB_ENV_HEADER */

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

@@ -142,7 +142,9 @@ typedef struct ventoy_windows_data
 
     grub_uint32_t auto_install_len;
 
-    grub_uint8_t reserved[255 - 4];
+    grub_uint8_t windows11_bypass_nro;
+
+    grub_uint8_t reserved[255 - 5];
 
     /* auto_intall file buf */
     /* ...... + auto_install_len */

GRUB2/MOD_SRC/grub-2.04/install.sh

@@ -12,7 +12,7 @@ make install
 PATH=$VT_DIR/GRUB2/INSTALL/bin/:$VT_DIR/GRUB2/INSTALL/sbin/:$PATH
 
 net_modules_legacy="net tftp http"
-all_modules_legacy="file setkey date drivemap blocklist regexp newc vga_text ntldr search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio lspci pci ext2 xfs ventoy chain read halt iso9660 linux16 test true sleep reboot echo videotest videoinfo videotest_checksum video_colors video_cirrus video_bochs vga vbe video_fb font video gettext extcmd terminal  linux minicmd help configfile tr trig boot biosdisk disk ls tar squash4 password_pbkdf2 all_video png jpeg part_gpt part_msdos fat exfat ntfs loopback gzio normal  udf gfxmenu gfxterm gfxterm_background gfxterm_menu smbios zfs"
+all_modules_legacy="file date drivemap blocklist newc vga_text ntldr search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio lspci pci ext2 xfs ventoy chain read halt iso9660 linux16 test true sleep reboot echo videotest videoinfo videotest_checksum video_colors video_cirrus video_bochs vga vbe font video gettext extcmd terminal  linux minicmd help configfile tr trig boot biosdisk disk ls tar squash4 password_pbkdf2 all_video png jpeg part_gpt part_msdos fat exfat ntfs loopback gzio normal video_fb udf gfxmenu gfxterm gfxterm_background gfxterm_menu smbios"
 
 net_modules_uefi="efinet net tftp http"
 all_modules_uefi="file setkey blocklist ventoy test true regexp newc search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux relocator jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop efi_uga video_bochs video_cirrus video video_fb gfxterm_background gfxterm_menu mouse fwload smbios zfs"

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

@@ -20,7 +20,7 @@
 . $VTOY_PATH/hook/ventoy-os-lib.sh
 
 $BUSYBOX_PATH/mkdir /dev
-$BUSYBOX_PATH/mknod -m 660 /dev/console b 5 1
+$BUSYBOX_PATH/mknod -m 660 /dev/console c 5 1
 
 $SED "/for device in/i $BUSYBOX_PATH/sh $VTOY_PATH/hook/aryalinux/disk_hook.sh" -i /init
 #$SED "/for device in/i exec $BUSYBOX_PATH/sh" -i /init

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

@@ -0,0 +1,32 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. /ventoy/hook/ventoy-hook-lib.sh
+
+for i in 0 1 2 3 4 5 6 7 8 9; do 
+    vtdiskname=$(get_ventoy_disk_name)
+    if [ "$vtdiskname" = "unknown" ]; then
+        vtlog "wait for disk ..."
+        $SLEEP 3
+    else
+        break
+    fi
+done
+
+ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2"

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

@@ -0,0 +1,22 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. $VTOY_PATH/hook/ventoy-os-lib.sh
+
+$SED "/maybe_break *premount/a\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/chimera/disk_hook.sh"  -i /init    

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

@@ -40,13 +40,13 @@ ventoy_os_install_dmsetup_by_unsquashfs() {
     
     dmModPath="/usr/lib/modules/$vtKerVer/kernel/drivers/md/dm-mod.$vtKoPo"
     echo $dmModPath > $VTOY_PATH/fsextract
-    vtoy_unsquashfs -d $VTOY_PATH/sqfs -n -q -e $VTOY_PATH/fsextract $VTOY_PATH/fsdisk
+    vtoy_unsquashfs -d $VTOY_PATH/sqfs -n -q -e $VTOY_PATH/fsextract $VTOY_PATH/fsdisk 2>>$VTLOG
 
     if ! [ -e $VTOY_PATH/sqfs${dmModPath} ]; then
         rm -rf $VTOY_PATH/sqfs
         dmModPath="/lib/modules/$vtKerVer/kernel/drivers/md/dm-mod.$vtKoPo"
         echo $dmModPath > $VTOY_PATH/fsextract
-        vtoy_unsquashfs -d $VTOY_PATH/sqfs -n -q -e $VTOY_PATH/fsextract $VTOY_PATH/fsdisk
+        vtoy_unsquashfs -d $VTOY_PATH/sqfs -n -q -e $VTOY_PATH/fsextract $VTOY_PATH/fsdisk 2>>$VTLOG
     fi
     
     if [ -e $VTOY_PATH/sqfs${dmModPath} ]; then

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

@@ -37,12 +37,20 @@ ventoy_os_install_dmsetup_by_fuse() {
 
     mount -t iso9660  $VTOY_PATH/mnt/fuse/ventoy.iso    $VTOY_PATH/mnt/iso
 
-    sfsfile=$(ls $VTOY_PATH/mnt/iso/*.sfs)
+    if ls $VTOY_PATH/mnt/iso/zdrv_*.sfs 2>/dev/null; then
+        sfsfile=$(ls $VTOY_PATH/mnt/iso/zdrv_*.sfs)
+    else
+        sfsfile=$(ls $VTOY_PATH/mnt/iso/*.sfs)
+    fi
 
     mount -t squashfs $sfsfile  $VTOY_PATH/mnt/squashfs
 
     kVer=$(uname -r)
     KoName=$(ls $VTOY_PATH/mnt/squashfs/lib/modules/$kVer/kernel/drivers/md/dm-mod.ko*)
+    if [ -z "$KoName" ]; then
+        KoName=$(ls $VTOY_PATH/mnt/squashfs/usr/lib/modules/$kVer/kernel/drivers/md/dm-mod.ko*)
+    fi
+
     vtlog "insmod $KoName"
     insmod $KoName
 

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

@@ -28,6 +28,7 @@ vtlog "####### $0 $* ########"
 VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
 
 ventoy_os_install_dmsetup_by_fuse() {
+    local drvdir=""
     vtlog "ventoy_os_install_dmsetup_by_fuse $*"
 
     mkdir -p $VTOY_PATH/mnt/fuse $VTOY_PATH/mnt/iso $VTOY_PATH/mnt/squashfs
@@ -37,11 +38,13 @@ ventoy_os_install_dmsetup_by_fuse() {
 
     mount -t iso9660  $VTOY_PATH/mnt/fuse/ventoy.iso    $VTOY_PATH/mnt/iso
     
+    
     for sfsfile in $(ls $VTOY_PATH/mnt/iso/*drv_veket*.sfs); do
         mount -t squashfs $sfsfile  $VTOY_PATH/mnt/squashfs        
         if [ -d $VTOY_PATH/mnt/squashfs/lib/modules ]; then
             KoName=$(ls $VTOY_PATH/mnt/squashfs/lib/modules/$2/kernel/drivers/md/dm-mod.ko*)
             if [ -n "$KoName" -a -f $KoName ]; then
+                drvdir=$VTOY_PATH/mnt/squashfs/lib/modules/$2
                 break
             fi
         fi
@@ -49,11 +52,29 @@ ventoy_os_install_dmsetup_by_fuse() {
         umount $VTOY_PATH/mnt/squashfs
     done
 
-    KoName=$(ls $VTOY_PATH/mnt/squashfs/lib/modules/$2/kernel/drivers/dax/dax.ko*)
+
+    if [ -z "$drvdir" ]; then
+        vtlog "retry for usr/lib dir"
+        for sfsfile in $(ls $VTOY_PATH/mnt/iso/*drv_veket*.sfs); do
+            mount -t squashfs $sfsfile  $VTOY_PATH/mnt/squashfs        
+            if [ -d $VTOY_PATH/mnt/squashfs/usr/lib/modules ]; then
+                KoName=$(ls $VTOY_PATH/mnt/squashfs/usr/lib/modules/$2/kernel/drivers/md/dm-mod.ko*)
+                if [ -n "$KoName" -a -f $KoName ]; then
+                    drvdir=$VTOY_PATH/mnt/squashfs/usr/lib/modules/$2
+                    break
+                fi
+            fi
+            
+            umount $VTOY_PATH/mnt/squashfs
+        done
+    fi
+    
+
+    KoName=$(ls $drvdir/kernel/drivers/dax/dax.ko*)
     vtlog "insmod $KoName"
     insmod $KoName 
     
-    KoName=$(ls $VTOY_PATH/mnt/squashfs/lib/modules/$2/kernel/drivers/md/dm-mod.ko*)
+    KoName=$(ls $drvdir/kernel/drivers/md/dm-mod.ko*)
     vtlog "insmod $KoName"
     insmod $KoName 
 

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

@@ -26,6 +26,10 @@ ventoy_get_debian_distro() {
         if $EGREP -q "ID=.*antix|ID=.*mx" /etc/initrd-release; then
             echo 'antix'; return
         fi
+    elif [ -e /etc/initrd_release ]; then
+        if $EGREP -q "ID=.*antix|ID=.*mx" /etc/initrd_release; then
+            echo 'antix'; return
+        fi
     fi
     
     if [ -e /DISTRO_SPECS ]; then
@@ -45,6 +49,8 @@ ventoy_get_debian_distro() {
             echo 'mll'; return
         elif $GREP -m1 -q 'stratodesk.com' /init; then
             echo 'stratodesk'; return
+        elif $GREP -q "\bPVE\b" /init; then
+            echo 'pve'; return
         fi
     fi
 

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

@@ -0,0 +1,40 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. /ventoy/hook/ventoy-hook-lib.sh
+
+vtlog "####### $0 $* ########"
+
+VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
+
+wait_for_usb_disk_ready
+
+vtdiskname=$(get_ventoy_disk_name)
+if [ "$vtdiskname" = "unknown" ]; then
+    vtlog "ventoy disk not found"
+    PATH=$VTPATH_OLD
+    exit 0
+fi
+
+vtlog "${vtdiskname#/dev/}2 found..."
+$BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/udev_disk_hook.sh "${vtdiskname#/dev/}2"
+
+if [ -f /ventoy/autoinstall ]; then
+    sh /ventoy/hook/default/auto_install_varexp.sh  /ventoy/autoinstall
+fi

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

@@ -0,0 +1,151 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. /ventoy/hook/ventoy-hook-lib.sh
+
+ventoy_os_install_dmsetup() {
+
+    vtlog "ventoy_os_install_dmsetup $1 ..."
+
+    vt_usb_disk=$1
+
+    # dump iso file location
+    $VTOY_PATH/tool/vtoydm -i -f $VTOY_PATH/ventoy_image_map -d ${vt_usb_disk} > $VTOY_PATH/iso_file_list
+
+    # install dmsetup 
+    LINE=$($GREP ' dmsetup.*\.udeb'  $VTOY_PATH/iso_file_list)
+    if [ $? -eq 0 ]; then
+        install_udeb_from_line "$LINE" ${vt_usb_disk}
+    fi
+
+    # install libdevmapper
+    LINE=$($GREP ' libdevmapper.*\.udeb'  $VTOY_PATH/iso_file_list)
+    if [ $? -eq 0 ]; then
+        install_udeb_from_line "$LINE" ${vt_usb_disk}
+    fi
+
+    # install md-modules
+    LINE=$($GREP -i ' md-modules.*\.udeb'  $VTOY_PATH/iso_file_list)
+    if [ $? -eq 0 ]; then
+        LINTCNT=$($GREP -i -c ' md-modules.*\.udeb'  $VTOY_PATH/iso_file_list)
+        if [ $LINTCNT -gt 1 ]; then
+            vtlog "more than one pkgs, need to filter..."
+            VER=$($BUSYBOX_PATH/uname -r)
+            
+            LINE=$($GREP -i ' md-modules.*\.udeb'  $VTOY_PATH/iso_file_list | $GREP -i $VER)
+            LINTCNT=$($GREP -i ' md-modules.*\.udeb'  $VTOY_PATH/iso_file_list | $GREP -i -c $VER)
+            if [ $LINTCNT -gt 1 ]; then
+                vtlog "Still more than one pkgs, use the first one..."
+                LINE=$($GREP -i ' md-modules.*\.udeb'  $VTOY_PATH/iso_file_list | $GREP -i -m1 $VER)
+            fi
+        fi
+        install_udeb_from_line "$LINE" ${vt_usb_disk} 
+    fi
+
+    # insmod md-mod if needed
+    if $GREP -q 'device-mapper' /proc/devices; then
+        vtlog "device mapper module is loaded"
+    else
+        vtlog "device mapper module is NOT loaded, now load it..."
+        
+        VER=$($BUSYBOX_PATH/uname -r)    
+        KO=$($FIND /lib/modules/$VER/kernel/drivers/md -name "dm-mod*")
+        vtlog "KO=$KO"
+        
+        insmod $KO
+    fi
+    
+    vtlog "dmsetup install finish, now check it..."
+    if dmsetup info >> $VTLOG 2>&1; then
+        vtlog "dmsetup work ok"
+    else
+        vtlog "dmsetup not work, now try to load eglibc ..."
+        
+        # install eglibc (some ubuntu 32 bit version need it)
+        LINE=$($GREP 'libc6-.*\.udeb'  $VTOY_PATH/iso_file_list)
+        if [ $? -eq 0 ]; then
+            install_udeb_from_line "$LINE" ${vt_usb_disk} 
+        fi
+        
+        if dmsetup info >> $VTLOG 2>&1; then
+            vtlog "dmsetup work ok after retry"
+        else
+            vtlog "dmsetup still not work after retry"
+        fi
+    fi
+}
+
+if is_ventoy_hook_finished || not_ventoy_disk "${1:0:-1}"; then
+    exit 0
+fi
+
+vtlog "==== $0 $* ====" 
+
+dmsetup_path=$(ventoy_find_bin_path dmsetup)
+if [ -z "$dmsetup_path" ]; then
+    ventoy_os_install_dmsetup "/dev/${1:0:-1}"
+fi
+
+if ! $GREP -q 'device-mapper' /proc/devices; then
+    ventoy_os_install_dmsetup "/dev/${1:0:-1}"
+fi
+
+ventoy_udev_disk_common_hook $*
+
+#
+# Some distro default only accept usb partitions as install medium.
+# So if ventoy is installed on a non-USB device, we just mount /cdrom here except
+# for these has boot=live or boot=casper parameter in cmdline
+#
+VT_BUS_USB=""
+if [ -n "$ID_BUS" ]; then
+    if echo $ID_BUS | $GREP -q -i usb; then
+        VT_BUS_USB="YES"
+    fi
+else
+    if $BUSYBOX_PATH/ls -l /sys/class/block/${1:0:-1} | $GREP -q -i usb; then
+        VT_BUS_USB="YES"
+    fi
+fi
+
+if [ -n "$VT_BUS_USB" ]; then
+    vtlog "$1 is USB device"
+    echo /dev/$1 > /ventoy/list-devices-usb-part
+else
+    vtlog "$1 is NOT USB device (bus $ID_BUS)"
+    
+    if $EGREP -q 'boot=|casper' /proc/cmdline; then
+        vtlog "boot=, or casper, don't mount"
+    else
+        vtlog "No boot param, need to mount"
+        echo /dev/$1 > /ventoy/list-devices-usb-part
+    fi
+fi
+
+#special process for Linx
+if $BUSYBOX_PATH/uname -r | $GREP -q "^2\.6"; then
+    if $GREP -q "linx" /proc/version; then
+        blkdev_num=$($VTOY_PATH/tool/dmsetup ls | $GREP ventoy | $SED 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
+        vtDM=$(ventoy_find_dm_id ${blkdev_num}) 
+        echo "/dev/$vtDM" > /ventoy/list-devices-usb-part
+    fi
+fi
+
+# OK finish
+set_ventoy_hook_finish

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

@@ -0,0 +1,42 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+
+if [ -e /init ] && $GREP -q '^mountroot$' /init; then
+    echo "Here before mountroot ..." >> $VTLOG
+    
+    $SED  "/^mountroot$/i\\$BUSYBOX_PATH/sh $VTOY_PATH/hook/deepin/disk_mount_hook.sh"  -i /init
+    $SED  "/^mountroot$/i\\export LIVEMEDIA=/dev/mapper/ventoy"  -i /init
+    $SED  "/^mountroot$/i\\export LIVE_MEDIA=/dev/mapper/ventoy"  -i /init    
+
+    if $GREP -q 'live-media=' /proc/cmdline; then
+        if [ -f /scripts/casper ] && $GREP -q '^  *LIVEMEDIA=' /scripts/casper; then
+            $SED "s#^  *LIVEMEDIA=.*#LIVEMEDIA=/dev/mapper/ventoy#" -i /scripts/casper
+        fi
+    fi
+else
+    echo "Here use udev hook ..." >> $VTLOG
+    ventoy_systemd_udevd_work_around
+    ventoy_add_udev_rule "$VTOY_PATH/hook/deepin/udev_disk_hook.sh %k"
+fi
+
+if [ -f $VTOY_PATH/autoinstall ]; then
+    echo "Do auto install ..." >> $VTLOG
+    $SED '/maybe_break[[:space:]]*init/i\/ventoy/busybox/sh /ventoy/hook/deepin/ventoy_autoinstall.sh >>/ventoy/autoinstall.log 2>&1' -i /init
+fi

IMG/cpio/ventoy/hook/deepin/ventoy_autoinstall.sh

@@ -0,0 +1,122 @@
+#!/ventoy/busybox/sh
+
+. /ventoy/hook/ventoy_hook_lib.sh
+
+change_var_value() {
+    local vfile=$1
+    local vkey=$2
+    local vVal=$3
+    local quote=$4
+    local vline
+    
+    if [ $quote -eq 0 ]; then
+        vline="$vkey = $vVal"
+    else
+        vline="$vkey = \"$vVal\""
+    fi
+    
+    if grep -q -m1 "^$vkey[[:space:]]*=" $vfile; then
+        sed "s#^$vkey[[:space:]]*=.*#$vline#g" -i $vfile
+    else
+        echo "$vline" >> $vfile
+    fi
+}
+
+setting_script_process() {
+    local sfile=$1
+    local vItem
+    local vB64Item
+    
+    vItem=$(grep '^language[[:space:]]*=' /ventoy/autoinstall | awk  '{print $3}')
+    if [ -n "$vItem" ]; then
+        change_var_value $sfile 'select_language_default_locale' "$vItem" 0
+    fi
+    
+    vItem=$(grep '^timezone[[:space:]]*=' /ventoy/autoinstall | awk  '{print $3}')
+    if [ -n "$vItem" ]; then
+        change_var_value $sfile 'timezone_default' "$vItem" 0
+    fi
+    
+    vItem=$(grep '^hostname[[:space:]]*=' /ventoy/autoinstall | awk  '{print $3}')
+    if [ -n "$vItem" ]; then
+        change_var_value $sfile 'system_info_default_hostname' "$vItem" 1
+        change_var_value $sfile 'DI_HOSTNAME' "$vItem" 1
+    fi
+    
+    vItem=$(grep '^root_password[[:space:]]*=' /ventoy/autoinstall | awk  '{print $3}')
+    if [ -n "$vItem" ]; then
+        vB64Item=$(echo -n "$vItem" | base64)
+        change_var_value $sfile 'system_info_default_root_password' "$vB64Item" 1
+        change_var_value $sfile 'DI_ROOTPASSWORD' "$vB64Item" 1
+    fi
+    
+    vItem=$(grep '^default_username[[:space:]]*=' /ventoy/autoinstall | awk  '{print $3}')
+    if [ -n "$vItem" ]; then
+        change_var_value $sfile 'system_info_default_username' "$vItem" 1
+        change_var_value $sfile 'DI_USERNAME' "$vItem" 1
+    fi
+    
+    vItem=$(grep '^default_password[[:space:]]*=' /ventoy/autoinstall | awk  '{print $3}')
+    if [ -n "$vItem" ]; then
+        change_var_value $sfile 'system_info_default_password' "$vItem" 1
+        change_var_value $sfile 'DI_PASSWORD' "$vItem" 1
+    fi
+    
+    vItem=$(grep '^install_disk[[:space:]]*=' /ventoy/autoinstall | awk  '{print $3}')
+    if [ -n "$vItem" ]; then
+        echo "DI_FULLDISK_MULTIDISK_DEVICE = $vItem" >> $sfile
+        echo "DI_ROOTDISK = $vItem" >> $sfile
+        echo "DI_BOOTLOADER = $vItem" >> $sfile
+    fi
+    
+    change_var_value $sfile 'skip_virtual_machine_page' 'true' 0
+    change_var_value $sfile 'skip_select_language_page' 'true' 0
+    change_var_value $sfile 'skip_select_language_page_on_first_boot' 'true' 0
+    change_var_value $sfile 'skip_system_keyboard_page' 'true' 0
+    change_var_value $sfile 'skip_system_info_page' 'true' 0
+    change_var_value $sfile 'skip_qr_code_system_info_page' 'true' 0
+    change_var_value $sfile 'skip_timezone_page' 'true' 0
+    change_var_value $sfile 'skip_partition_page' 'true' 0
+    change_var_value $sfile 'system_info_password_validate_required' '0' 0
+    change_var_value $sfile 'system_info_password_strong_check' 'false' 0
+    change_var_value $sfile 'partition_do_auto_part' 'true' 0
+    change_var_value $sfile 'system_info_disable_license' 'true' 0
+    change_var_value $sfile 'system_info_disable_experience' 'true' 0
+    change_var_value $sfile 'system_info_disable_privacy_license' 'true' 0
+    
+    #filesystem.squashfs search ini
+    #first_page_state=0，表示不跳过首页，展示首页让用户自己选择
+    #first_page_state=1，表示跳过首页，并且自动点击一键安装
+    #first_page_state=2，表示跳过首页，并且自动点击自定义安装
+    #first_page_state=3，表示跳过首页，并且直接以全盘安装方式自动安装
+    change_var_value $sfile 'first_page_state' '3' 0
+}
+
+update_settings() {
+    local script=$1
+    local newscript
+    
+    echo "update_settings for $script ..."
+    
+    newscript=$(basename $script)
+    cp -a $script /ventoy/vini_${newscript}
+    setting_script_process /ventoy/vini_${newscript}
+    
+    rm -f $script
+    cp -a /ventoy/vini_${newscript} $script
+}
+
+sh /ventoy/hook/common/auto_install_varexp.sh  /ventoy/autoinstall
+
+update_settings /root/usr/share/deepin-installer/resources/default_settings.ini
+
+ls -1 /root/usr/share/deepin-installer/resources/override/ | while read line; do
+    update_settings /root/usr/share/deepin-installer/resources/override/$line
+done
+
+ls -1 /root/usr/share/deepin-installer/resources/oem/ | while read line; do
+    update_settings /root/usr/share/deepin-installer/resources/oem/$line
+done
+
+
+

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

@@ -0,0 +1,75 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. /ventoy/hook/ventoy-hook-lib.sh
+
+vtlog "######### $0 $* ############"
+
+if is_ventoy_hook_finished; then
+    exit 0
+fi
+
+wait_for_usb_disk_ready
+
+vtdiskname=$(get_ventoy_disk_name)
+if [ "$vtdiskname" = "unknown" ]; then
+    vtlog "ventoy disk not found"
+    exit 0
+fi
+
+ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace"
+
+blkdev_num=$($VTOY_PATH/tool/dmsetup ls | $GREP ventoy | $SED 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')
+vtDM=$(ventoy_find_dm_id ${blkdev_num})
+vtlog "blkdev_num=$blkdev_num vtDM=$vtDM ..."
+
+while [ -n "Y" ]; do
+    if [ -b /dev/$vtDM ]; then
+        break
+    else
+        sleep 0.3
+    fi
+done
+
+if [ -n "$1" ]; then
+    vtlog "ln -s /dev/$vtDM $1"
+    
+    if [ -e "$1" ]; then
+        vtlog "$1 already exist"
+    else
+        ln -s /dev/$vtDM "$1"
+    fi
+else
+    vtLABEL=$($BUSYBOX_PATH/blkid /dev/$vtDM | $SED 's/.*LABEL="\([^"]*\)".*/\1/')
+    vtlog "vtLABEL is $vtLABEL"
+    
+    if [ -z "$vtLABEL" ]; then
+        vtLABEL=$($SED "s/.*label=\([^ ]*\)/\1/" /proc/cmdline)
+        vtlog "vtLABEL is $vtLABEL from cmdline"
+    fi
+    
+    if [ -e "/dev/disk/by-label/$vtLABEL" ]; then
+        vtlog "$1 already exist"
+    else
+        ln -s /dev/$vtDM "/dev/disk/by-label/$vtLABEL"
+    fi
+fi 
+
+# OK finish
+set_ventoy_hook_finish

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

@@ -0,0 +1,25 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. $VTOY_PATH/hook/ventoy-os-lib.sh
+
+echo "hook live.init"  >> $VTLOG
+
+$SED "1i $BUSYBOX_PATH/sh $VTOY_PATH/hook/ewe/ventoy-disk.sh" -i /lib/tinyramfs/hook.d/live/live.init
+

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

@@ -24,6 +24,7 @@
 
 if [ -f $VTOY_PATH/autoinstall ]; then
     VTKS="inst.ks=file:$VTOY_PATH/autoinstall"
+    cp -a $VTOY_PATH/hook/rhel7/ventoy-autoexp.sh /lib/dracut/hooks/pre-mount/99-ventoy-autoexp.sh
 else
     for vtParam in $($CAT /proc/cmdline); do
         if echo $vtParam | $GREP -q 'ks=file:/'; then
@@ -90,23 +91,7 @@ if ls $VTOY_PATH | $GREP -q 'ventoy_dud[0-9]'; then
 fi
 echo "vtInstDD=$vtInstDD" >> $VTLOG
 
-if $GREP -q 'root=live' /proc/cmdline; then
-    $SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE root=live:/dev/ventoy $VTKS $VTOVERLAY $vtInstDD#" -i /lib/dracut-lib.sh
-else
-    $SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE inst.stage2=hd:/dev/ventoy $VTKS $VTOVERLAY $vtInstDD#" -i /lib/dracut-lib.sh
-fi
 
-ventoy_set_inotify_script  rhel7/ventoy-inotifyd-hook.sh
-
-#Fedora
-if $BUSYBOX_PATH/which dmsquash-live-root > /dev/null; then
-    vtPriority=99
-else
-    vtPriority=01
-fi
-
-$BUSYBOX_PATH/cp -a $VTOY_PATH/hook/rhel7/ventoy-inotifyd-start.sh /lib/dracut/hooks/pre-udev/${vtPriority}-ventoy-inotifyd-start.sh
-$BUSYBOX_PATH/cp -a $VTOY_PATH/hook/rhel7/ventoy-timeout.sh /lib/dracut/hooks/initqueue/timeout/${vtPriority}-ventoy-timeout.sh
 
 vtNeedRepo=
 if [ -f /etc/system-release ]; then
@@ -125,12 +110,61 @@ if $GREP -i -q Fedora /proc/version; then
     fi
 fi
 
+if $GREP -i -q Fedora /etc/os-release; then
+    if $GREP -q 'Server Edition' /etc/os-release; then
+        vtNeedRepo="yes"
+    fi
+fi
+
 echo "vtNeedRepo=$vtNeedRepo" >> $VTLOG
 
 if [ "$vtNeedRepo" = "yes" ]; then
     $BUSYBOX_PATH/cp -a $VTOY_PATH/hook/rhel7/ventoy-repo.sh /lib/dracut/hooks/pre-pivot/99-ventoy-repo.sh
 fi
 
+
+#iso-scan (currently only for Fedora)
+if $GREP -q Fedora /etc/os-release; then
+if /ventoy/tool/vtoydump -a /ventoy/ventoy_os_param; then
+    if ventoy_iso_scan_check; then
+        echo "iso_scan process ..." >> $VTLOG
+        
+        vtIsoPath=$(/ventoy/tool/vtoydump -p /ventoy/ventoy_os_param)
+        VTISO_SCAN="iso-scan/filename=$vtIsoPath"    
+        echo -n $vtIsoPath > /ventoy/vtoy_iso_scan
+
+        $SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE $VTISO_SCAN $VTKS $VTOVERLAY $vtInstDD#" -i /lib/dracut-lib.sh    
+        if [ "$VTOY_LINUX_REMOUNT" = "01" -a "$vtNeedRepo" != "yes" ]; then
+            ventoy_rw_iso_scan
+        fi
+
+        exit 0
+    fi
+fi    
+fi
+
+
+echo "common process ..." >> $VTLOG
+if $GREP -q 'root=live' /proc/cmdline; then
+    $SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE root=live:/dev/ventoy $VTKS $VTOVERLAY $VTISO_SCAN $vtInstDD#" -i /lib/dracut-lib.sh
+else
+    $SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE inst.stage2=hd:/dev/ventoy $VTKS $VTOVERLAY $VTISO_SCAN $vtInstDD#" -i /lib/dracut-lib.sh
+fi
+
+
+ventoy_set_inotify_script  rhel7/ventoy-inotifyd-hook.sh
+
+#Fedora
+if $BUSYBOX_PATH/which dmsquash-live-root > /dev/null; then
+    vtPriority=99
+else
+    vtPriority=01
+fi
+
+$BUSYBOX_PATH/cp -a $VTOY_PATH/hook/rhel7/ventoy-inotifyd-start.sh /lib/dracut/hooks/pre-udev/${vtPriority}-ventoy-inotifyd-start.sh
+$BUSYBOX_PATH/cp -a $VTOY_PATH/hook/rhel7/ventoy-timeout.sh /lib/dracut/hooks/initqueue/timeout/${vtPriority}-ventoy-timeout.sh
+
+
 if [ -e /sbin/dmsquash-live-root ]; then
     echo "patch /sbin/dmsquash-live-root ..." >> $VTLOG
     $SED "1 a $BUSYBOX_PATH/sh $VTOY_PATH/hook/rhel7/ventoy-make-link.sh" -i /sbin/dmsquash-live-root
@@ -147,6 +181,18 @@ if $GREP -i -q 'fedora.*coreos' /etc/os-release; then
     cp -a $VTOY_PATH/hook/rhel7/ventoy-make-link.sh /lib/dracut/hooks/pre-mount/99-ventoy-premount-mklink.sh
 fi
 
-if [ -f $VTOY_PATH/autoinstall ]; then
-    cp -a $VTOY_PATH/hook/rhel7/ventoy-autoexp.sh /lib/dracut/hooks/pre-mount/99-ventoy-autoexp.sh
+
+#special distro magic
+$BUSYBOX_PATH/mkdir -p $VTOY_PATH/distmagic
+if $GREP -q SCRE /proc/cmdline; then
+    echo 1 > $VTOY_PATH/distmagic/SCRE
 fi
+
+if $GREP -qw 'SA[.]1' /proc/cmdline; then
+if $GREP -qw 'writable.fsimg' /proc/cmdline; then
+if $GREP -qw 'rw'     /proc/cmdline; then
+    echo 1 > $VTOY_PATH/distmagic/DELL_PER
+fi
+fi
+fi
+

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

@@ -0,0 +1,26 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2023, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. /ventoy/hook/ventoy-hook-lib.sh
+
+vtHook=$($CAT $VTOY_PATH/inotifyd-hook-script.txt)
+
+vtdisk=$(get_ventoy_disk_name)
+vtlog "... $vtdisk already exist ..."
+$BUSYBOX_PATH/sh $vtHook n /dev "${vtdisk#/dev/}2"    

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

@@ -50,7 +50,11 @@ if is_inotify_ventoy_part $3; then
         vtScript=$($GREP -m1 'RUN.=' $vtGenRulFile | $AWK -F'RUN.=' '{print $2}' | $SED 's/"\(.*\)".*/\1/')
         vtlog "vtScript=$vtScript"
         
-        if $GREP -q SCRE /proc/cmdline; then
+        if [ -f $VTOY_PATH/distmagic/SCRE ]; then
+            /sbin/dmsquash-live-root /dev/ventoy
+        elif [ -f $VTOY_PATH/distmagic/DELL_PER ]; then
+            sed 's/liverw=[^ ]*/liverw=ro/g' -i /sbin/dmsquash-live-root
+            sed 's/writable_fsimg=[^ ]*/writable_fsimg=""/g' -i /sbin/dmsquash-live-root
             /sbin/dmsquash-live-root /dev/ventoy
         else
             $vtScript

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

@@ -27,5 +27,8 @@ if [ "$vtdisk" = "unknown" ]; then
     $BUSYBOX_PATH/nohup $VTOY_PATH/tool/inotifyd $vtHook  /dev:n  2>&-  & 
 else
     vtlog "... $vtdisk already exist ..."
-    $BUSYBOX_PATH/sh $vtHook n /dev "${vtdisk#/dev/}2"
+    
+    #don't call it too early issue 2225
+    #$BUSYBOX_PATH/sh $vtHook n /dev "${vtdisk#/dev/}2"
+    cp -a  $VTOY_PATH/hook/rhel7/ventoy-inotifyd-call.sh /lib/dracut/hooks/initqueue/settled/90-ventoy-inotifyd-call.sh   
 fi

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

@@ -26,7 +26,9 @@ fi
 blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
 vtDM=$(ventoy_find_dm_id ${blkdev_num})
 
-if ! [ -e /dev/mapper/ventoy ]; then
+if [ -e /dev/mapper/ventoy ]; then
+    vtlog "/dev/mapper/ventoy already exist"
+else
     vtlog "link /dev/$vtDM to /dev/mapper/ventoy"
     ln -s /dev/$vtDM /dev/mapper/ventoy
 fi
@@ -35,7 +37,13 @@ VTLABEL=$($BUSYBOX_PATH/blkid /dev/$vtDM | $SED 's/.*LABEL="\([^"]*\)".*/\1/')
 vtlog "VTLABEL=$VTLABEL"
 
 if [ -n "$VTLABEL" ]; then
-    if ! [ -e "/dev/disk/by-label/$VTLABEL" ]; then
+    if ! [ -d /dev/disk/by-label ]; then
+        mkdir -p /dev/disk/by-label
+    fi
+
+    if [ -e "/dev/disk/by-label/$VTLABEL" ]; then
+        vtlog "/dev/disk/by-label/$VTLABEL already exist"
+    else
         vtlog "link /dev/$vtDM to /dev/disk/by-label/$VTLABEL"
         ln -s /dev/$vtDM "/dev/disk/by-label/$VTLABEL"
     fi

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

@@ -23,7 +23,18 @@ vtlog "##### $0 $* ..."
 
 VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
 
-repodev=$(ls $VTOY_PATH/dev_backup*)
-echo "inst.repo=hd:/dev/${repodev#*dev_backup_}" >> /sysroot/etc/cmdline
+if [ -f /ventoy/vtoy_iso_scan ]; then
+    repopath=$(cat /ventoy/vtoy_iso_scan)
+    repodev=$(vtoydump -f /ventoy/ventoy_os_param | awk -F'#' '{print $1}')
+    if echo $repodev | egrep -q "nvme|mmc|nbd"; then
+        vtpart1=${repodev}p1
+    else
+        vtpart1=${repodev}1
+    fi
+    echo "inst.repo=hd:${vtpart1}:${repopath}" >> /sysroot/etc/cmdline
+else
+    repodev=$(ls $VTOY_PATH/dev_backup*)
+    echo "inst.repo=hd:/dev/${repodev#*dev_backup_}" >> /sysroot/etc/cmdline
+fi
 
 PATH=$VTPATH_OLD

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

@@ -54,6 +54,21 @@ if [ -z "$dmsetup_path" ]; then
     ventoy_os_install_dmsetup "/dev/${1:0:-1}"
 fi
 
+if [ -f /proc/devices ]; then
+    vtlog "/proc/devices exist OK"
+else
+    for i in 1 2 3 4 5 6 7 8 9; do
+        if [ -f /proc/devices ]; then
+            vtlog "/proc/devices exist OK now"
+            break
+        else
+            vtlog "/proc/devices NOT exist, wait $i"
+            $BUSYBOX_PATH/sleep 1
+        fi
+    done
+fi
+
+
 ventoy_udev_disk_common_hook $*
 
 # OK finish

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

@@ -60,7 +60,7 @@ fi
 if [ -e /etc/initrd.functions ] && $GREP -q 'HPIP' /etc/initrd.functions; then
     echo "HPIP" >> $VTLOG    
     $BUSYBOX_PATH/mkdir /dev
-    $BUSYBOX_PATH/mknod -m 660 /dev/console b 5 1
+    $BUSYBOX_PATH/mknod -m 660 /dev/console c 5 1
     $SED "/CD_DEVICES=/a $BUSYBOX_PATH/sh $VTOY_PATH/hook/suse/disk_hook.sh" -i /etc/initrd.functions
     $SED "/CD_DEVICES=/a CD_DEVICES=\"/dev/ventoy \$CD_DEVICES\"" -i /etc/initrd.functions
 elif [ -f /scripts/udev_setup ]; then

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

@@ -209,11 +209,20 @@ ventoy_check_dm_module() {
         vtlog "modprobe failed, now try to insmod ko..."
     
         $FIND /lib/modules/ -name "dm-mod.ko*" | while read vtline; do
-            vtlog "insmode $vtline "
+            vtlog "insmod $vtline "
             $BUSYBOX_PATH/insmod $vtline >>$VTLOG 2>&1
+            if [ $? -eq 0 ]; then
+                vtlog "insmod success"
+            else
+                vtlog "insmod failed, try decompress"
+                if echo $vtline | $GREP -q "\.zst"; then
+                    $VTOY_PATH/tool/zstdcat $vtline > $VTOY_PATH/extract_dm_mod.ko
+                    $BUSYBOX_PATH/insmod $VTOY_PATH/extract_dm_mod.ko >>$VTLOG 2>&1
+                fi
+            fi
         done
     fi
-    
+
     if $GREP -q 'device-mapper' /proc/devices; then
         vtlog "device-mapper found in /proc/devices after retry"
         $BUSYBOX_PATH/true; return
@@ -223,6 +232,42 @@ ventoy_check_dm_module() {
     fi
 }
 
+ventoy_need_proc_ibt() {
+    vtKv=$($BUSYBOX_PATH/uname -r)
+    vtMajor=$(echo $vtKv | $AWK -F. '{print $1}')
+    vtMinor=$(echo $vtKv | $AWK -F. '{print $2}')
+    
+    #ibt was supported since linux kernel 5.18
+    if [ $vtMajor -lt 5 ]; then
+        $BUSYBOX_PATH/false; return
+    elif [ $vtMajor -eq 5 ]; then
+        if [ $vtMajor -lt 18 ]; then
+            $BUSYBOX_PATH/false; return
+        fi
+    fi
+    
+    if $GREP -q ' ibt=off' /proc/cmdline; then
+        $BUSYBOX_PATH/false; return
+    fi
+
+    #hardware CPU doesn't support IBT
+    if $VTOY_PATH/tool/vtoykmod -I; then
+        :
+    else
+        $BUSYBOX_PATH/false; return
+    fi
+    
+    #dot.CONFIG not enabled
+    if $GREP -q ' ibt_restore$' /proc/kallsyms; then
+        :
+    else
+        $BUSYBOX_PATH/false; return
+    fi
+    
+    $BUSYBOX_PATH/true
+}
+
+
 ventoy_need_dm_patch() {
     if [ "$VTOY_LINUX_REMOUNT" != "01" ]; then
         if $GREP -q 'VTOY_LINUX_REMOUNT=1' /proc/cmdline; then
@@ -256,6 +301,7 @@ ventoy_need_dm_patch() {
 }
 
 ventoy_dm_patch() {
+    vtDmPatchDebug=0
     vtMType=$($BUSYBOX_PATH/uname -m)
 
     vtlog "######### ventoy_dm_patch ############"
@@ -269,6 +315,16 @@ ventoy_dm_patch() {
         return
     fi
 
+    if ventoy_need_proc_ibt; then
+        vtlog "need to proc IBT"
+        vtKoName=dm_patch_ibt_64.ko
+        vtIBT='0x8888'
+    else
+        vtlog "NO need to proc IBT"
+        vtIBT='0'
+    fi 
+
+
     if [ -f $VTOY_PATH/tool/$vtKoName ]; then
         vtlog "/ventoy/tool/$vtKoName exist OK"
     else
@@ -279,8 +335,9 @@ ventoy_dm_patch() {
     $CAT /proc/kallsyms | $BUSYBOX_PATH/sort > $VTOY_PATH/kallsyms
     
     if $GREP -m1 -q 'open_table_device.isra' $VTOY_PATH/kallsyms; then
-        vtLine=$($VTOY_PATH/tool/vtoyksym open_table_device.isra $VTOY_PATH/kallsyms)
-        vtlog "get open_table_device.isra address $vtLine"
+        vtISRA=$($GREP -m1 'open_table_device.isra' $VTOY_PATH/kallsyms | $AWK '{print $3}')
+        vtLine=$($VTOY_PATH/tool/vtoyksym $vtISRA $VTOY_PATH/kallsyms)
+        vtlog "get $vtISRA address $vtLine"
     else
         vtLine=$($VTOY_PATH/tool/vtoyksym dm_get_table_device $VTOY_PATH/kallsyms)
         vtlog "get dm_get_table_device address $vtLine"
@@ -288,6 +345,23 @@ ventoy_dm_patch() {
     get_addr=$(echo $vtLine | $AWK '{print $1}')
     get_size=$(echo $vtLine | $AWK '{print $2}')
 
+    vtLine=$($VTOY_PATH/tool/vtoyksym blkdev_get_by_dev $VTOY_PATH/kallsyms) 
+    vtlog "get blkdev_get_by_dev address $vtLine"        
+    blkdev_get_addr=$(echo $vtLine | $AWK '{print $1}')
+    
+    vtLine=$($VTOY_PATH/tool/vtoyksym blkdev_put $VTOY_PATH/kallsyms) 
+    vtlog "get blkdev_put address $vtLine"        
+    blkdev_put_addr=$(echo $vtLine | $AWK '{print $1}')
+    
+    vtLine=$($VTOY_PATH/tool/vtoyksym bdev_open_by_dev $VTOY_PATH/kallsyms) 
+    vtlog "get bdev_open_by_dev address $vtLine"        
+    bdev_open_addr=$(echo $vtLine | $AWK '{print $1}')
+    
+    vtLine=$($VTOY_PATH/tool/vtoyksym bdev_file_open_by_dev $VTOY_PATH/kallsyms) 
+    vtlog "get bdev_file_open_by_dev address $vtLine"        
+    bdev_file_open_addr=$(echo $vtLine | $AWK '{print $1}')
+    
+
     if $GREP -m1 -q 'close_table_device.isra' $VTOY_PATH/kallsyms; then
         vtLine=$($VTOY_PATH/tool/vtoyksym close_table_device.isra $VTOY_PATH/kallsyms)
         vtlog "get close_table_device.isra address $vtLine"
@@ -304,7 +378,19 @@ ventoy_dm_patch() {
     kprobe_unreg_addr=$($GREP ' unregister_kprobe$' /proc/kallsyms | $AWK '{print $1}')
     
     if [ "$VTOY_DEBUG_LEVEL" = "01" ]; then
+        vtDmPatchDebug=1
+    fi
+    
+    if $GREP -q 'dmpatch_debug' /proc/cmdline; then
+        vtDmPatchDebug=1
+    fi
+    
+    
+    if [ $vtDmPatchDebug -eq 1 ]; then
         printk_addr=$($GREP ' printk$' /proc/kallsyms | $AWK '{print $1}')
+        if [ -z "$printk_addr" ]; then
+            printk_addr=$($GREP ' _printk$' /proc/kallsyms | $AWK '{print $1}')
+        fi
         vtDebug="-v"
     else
         printk_addr=0
@@ -315,8 +401,9 @@ ventoy_dm_patch() {
     
     vtlog get_addr=$get_addr  get_size=$get_size
     vtlog put_addr=$put_addr  put_size=$put_size
+    vtlog blkdev_get_addr=$blkdev_get_addr blkdev_put_addr=$blkdev_put_addr
     vtlog kprobe_reg_addr=$kprobe_reg_addr  kprobe_unreg_addr=$kprobe_unreg_addr
-    vtlog ro_addr=$ro_addr  rw_addr=$rw_addr  printk_addr=$printk_addr
+    vtlog ro_addr=$ro_addr  rw_addr=$rw_addr  printk_addr=$printk_addr bdev_open_addr=$bdev_open_addr bdev_file_open_addr=$bdev_file_open_addr
 
     if [ "$get_addr" = "0" -o "$put_addr" = "0" ]; then
         vtlog "Invalid symbol address"
@@ -329,20 +416,26 @@ ventoy_dm_patch() {
 
 
     vtKv=$($BUSYBOX_PATH/uname -r)
+    vtKVMajor=$(echo $vtKv | $AWK -F. '{print $1}')
+    vtKVMinor=$(echo $vtKv | $AWK -F. '{print $2}')
+    vtKVSubMinor=$(echo $vtKv | $AWK -F. '{print $3}')
     
     if [ ! -d /lib/modules/$vtKv ]; then
         vtlog "No modules directory found"
         return
     elif [ -d /lib/modules/$vtKv/kernel/fs ]; then
         vtModPath=$($FIND /lib/modules/$vtKv/kernel/fs/ -name "*.ko*" | $HEAD -n1)
-    else
+    elif [ -d /lib/modules/$vtKv/kernel ]; then
         vtModPath=$($FIND /lib/modules/$vtKv/kernel/ -name "xfs.ko*" | $HEAD -n1)
+    elif [ -d /lib/modules/$vtKv/initrd ]; then
+        vtModPath=$($FIND /lib/modules/$vtKv/initrd/ -name "xfs.ko*" | $HEAD -n1)
     fi
-    
+
+
     if [ -z "$vtModPath" ]; then
-        vtModPath=$($FIND /lib/modules/$vtKv/kernel/ -name "*.ko*" | $HEAD -n1)
+        vtModPath=$($FIND /lib/modules/$vtKv/ -name "*.ko*" | $HEAD -n1)
     fi
-    
+
     vtModName=$($BUSYBOX_PATH/basename $vtModPath)
     
     vtlog "template module is $vtModPath $vtModName"
@@ -356,24 +449,37 @@ ventoy_dm_patch() {
         $BUSYBOX_PATH/xzcat $vtModPath > $VTOY_PATH/$vtModName
     elif echo $vtModPath | $GREP -q "[.]ko[.]gz$"; then
         $BUSYBOX_PATH/zcat $vtModPath > $VTOY_PATH/$vtModName
+    elif echo $vtModPath | $GREP -q "[.]ko[.]zst$"; then
+        $VTOY_PATH/tool/zstdcat $vtModPath > $VTOY_PATH/$vtModName
     else
         vtlog "unsupport module type"
         return
     fi
     
+       
+    
     #step1: modify vermagic/mod crc/relocation
-    vtlog "$VTOY_PATH/tool/vtoykmod -u $VTOY_PATH/tool/$vtKoName $VTOY_PATH/$vtModName $vtDebug"
-    $VTOY_PATH/tool/vtoykmod -u $VTOY_PATH/tool/$vtKoName $VTOY_PATH/$vtModName $vtDebug
+    vtlog "$VTOY_PATH/tool/vtoykmod -u $vtKVMajor $vtKVMinor $VTOY_PATH/tool/$vtKoName $VTOY_PATH/$vtModName $vtDebug"
+    $VTOY_PATH/tool/vtoykmod -u $vtKVMajor $vtKVMinor $VTOY_PATH/tool/$vtKoName $VTOY_PATH/$vtModName $vtDebug >>$VTLOG 2>&1
     
     #step2: fill parameters
     vtPgsize=$($VTOY_PATH/tool/vtoyksym -p)
-    vtlog "$VTOY_PATH/tool/vtoykmod -f $VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtDebug"
-    $VTOY_PATH/tool/vtoykmod -f $VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtDebug
+    
+    vtPrams="$VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtKVMajor $vtIBT $vtKVMinor $blkdev_get_addr $blkdev_put_addr $vtKVSubMinor $bdev_open_addr $bdev_file_open_addr  $vtDebug"
+    
+    
+    vtlog "$VTOY_PATH/tool/vtoykmod -f $vtPrams"
+    $VTOY_PATH/tool/vtoykmod -f $vtPrams >>$VTLOG 2>&1
 
-    $BUSYBOX_PATH/insmod $VTOY_PATH/tool/$vtKoName
+
+    vtlog "insmod $VTOY_PATH/tool/$vtKoName"
+    $BUSYBOX_PATH/insmod $VTOY_PATH/tool/$vtKoName  >>$VTLOG 2>&1
     
     if $GREP -q 'dm_patch' /proc/modules; then
+        vtlog "dm_patch module OK"
         echo "done" > $VTOY_PATH/dm_patch_done
+    else
+        vtlog "dm_patch module FAILED"
     fi
     
 }
@@ -892,3 +998,17 @@ ventoy_check_umount() {
         fi
     done
 }
+
+ventoy_wait_dir() {
+    vtdir=$1
+    vtsec=0
+    
+    while [ $vtsec -lt $2 ]; do
+        if [ -d "$vtdir" ]; then
+            break
+        else
+            $SLEEP 1
+            vtsec=$(expr $vtsec + 1)
+        fi
+    done
+}

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

@@ -121,3 +121,53 @@ ventoy_check_mount() {
         $BUSYBOX_PATH/mount $1 $2
     fi
 }
+
+ventoy_has_exfat_ko() {
+    vtExfat=''
+    vtKerVer=$($BUSYBOX_PATH/uname -r)
+    if [ -d /lib/modules/$vtKerVer/kernel/fs/exfat ]; then
+        vtExfat=$(ls /lib/modules/$vtKerVer/kernel/fs/exfat/)
+    fi
+    [ -n "$vtExfat" ]
+}
+
+ventoy_is_exfat_part() {
+    $VTOY_PATH/tool/vtoydump -s /ventoy/ventoy_os_param | $GREP -q exfat
+}
+
+ventoy_iso_scan_path() {
+    if [ -f /sbin/iso-scan ]; then
+        echo -n '/sbin/iso-scan'
+    elif [ -f /bin/iso-scan ]; then
+        echo -n '/bin/iso-scan'
+    else
+        echo -n ''
+    fi
+}
+
+ventoy_has_iso_scan() {
+    vtScanPath=$(ventoy_iso_scan_path)
+    [ -n "$vtScanPath" ]
+}
+
+ventoy_rw_iso_scan() {
+    vtScanPath=$(ventoy_iso_scan_path)
+    if [ -n "$vtScanPath" ]; then
+        if $GREP -q 'mount.* ro .*isoscan' $vtScanPath; then
+            $SED -i 's/\(mount.*-o.*\) ro /\1 rw /' $vtScanPath
+        fi
+    fi
+}
+
+ventoy_iso_scan_check() {
+    vtCheckOk=0
+    if ventoy_is_exfat_part; then
+        if ventoy_has_exfat_ko; then
+            if ventoy_has_iso_scan; then
+                vtCheckOk=1
+            fi
+        fi
+    fi
+    
+    [ $vtCheckOk -eq 1 ]
+}

IMG/cpio/ventoy/init_chain

@@ -72,27 +72,29 @@ ventoy_unpack_initramfs() {
     
     for vtx in '1F8B zcat' '1F9E zcat' '425A bzcat' '5D00 lzcat' 'FD37 xzcat' '894C lzopcat' '0221 lz4cat' '28B5 zstdcat' '3037 cat' '4C5A lunzip -c'; do
         if [ "${vtx:0:4}" = "${vtmagic:0:4}" ]; then
-            echo "vtx=$vtx" >> $VTLOG            
-            if [ $vtskip -eq 0 ]; then            
-                if [ "${vtx:5}" = "xzcat" ]; then
-                    rm -f $VTOY_PATH/xzlog
-                    ${vtx:5} $vtfile 2> $VTOY_PATH/xzlog | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
-                    if grep -q 'corrupted data' $VTOY_PATH/xzlog; then
-                        echo 'xzcat failed, now try xzminidec...' >> $VTLOG                        
-                        rm -f $VTOY_PATH/xzlog
-                        cat $vtfile | xzminidec 2> $VTOY_PATH/xzlog | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
+            echo "vtx=$vtx" >> $VTLOG  
+            if [ $vtskip -ne 0 ]; then
+                dd if=$vtfile skip=$vtskip iflag=skip_bytes status=none > ${vtfile}.skip
+                rm -f $vtfile
+                mv ${vtfile}.skip $vtfile
+            fi
 
-                        if grep -q 'limit' $VTOY_PATH/xzlog; then                    
-                            echo 'xzminidec failed, now try xzcat_musl ...' >> $VTLOG  
-                            xzcat_musl $vtfile | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
-                        fi
+            if [ "${vtx:5}" = "xzcat" ]; then
+                rm -f $VTOY_PATH/xzlog
+                ${vtx:5} $vtfile 2> $VTOY_PATH/xzlog | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
+                if grep -q 'corrupted data' $VTOY_PATH/xzlog; then
+                    echo 'xzcat failed, now try xzminidec...' >> $VTLOG                        
+                    rm -f $VTOY_PATH/xzlog
+                    cat $vtfile | xzminidec 2> $VTOY_PATH/xzlog | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
+
+                    if grep -q 'limit' $VTOY_PATH/xzlog; then                    
+                        echo 'xzminidec failed, now try xzcat_musl ...' >> $VTLOG  
+                        xzcat_musl $vtfile | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
                     fi
-                else
-                    ${vtx:5} $vtfile | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
                 fi
             else
-                dd if=$vtfile skip=$vtskip iflag=skip_bytes status=none | ${vtx:5} | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
-            fi
+                ${vtx:5} $vtfile | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
+            fi            
             break
         fi
     done
@@ -112,6 +114,28 @@ ventoy_unpack_initrd() {
     done    
 }
 
+vtfile_head_zero() {
+    local vsize
+    local voffset
+    local vfile
+    local vzero
+    local vdump
+    
+    voffset=0
+    vfile=$1
+    vsize=$(stat -c '%s' ${vfile})
+    vzero=$(hexdump -n 512 -e '512/1 "%02X"' $vfile)
+    
+    while [ $voffset -lt $vsize ]; do
+        vdump=$(hexdump -s $voffset -n 512 -e '512/1 "%02X"' $vfile)
+        if [ "$vdump" != "$vzero" ]; then
+            echo $voffset
+            return
+        fi
+        voffset=$($BUSYBOX_PATH/expr $voffset + 512)
+    done    
+    echo 0
+}
 
 # This export is for busybox cpio command
 export EXTRACT_UNSAFE_SYMLINKS=1
@@ -131,13 +155,22 @@ for vtfile in $(ls /initrd*); do
     #only for cpio,cpio,...,initrd sequence, initrd,cpio or initrd,initrd sequence is not supported
     while [ -e ${vtfile}_tmp ] && [ $(stat -c '%s' ${vtfile}_tmp) -gt 512 ]; do
         mv ${vtfile}_tmp $vtfile
+        
         vtdump=$(hexdump -n 512 -e '512/1 "%02X"' $vtfile)
         vtmagic=$(echo $vtdump | sed 's/^\(00\)*//')
         let vtoffset="(${#vtdump}-${#vtmagic})/2"
         
         if [ -z "$vtmagic" ]; then
-            echo "terminate with all zero data file" >> $VTLOG
-            break
+            vtHeadZero=$(vtfile_head_zero $vtfile)
+            if [ $vtHeadZero -gt 0 ]; then
+                vtdump=$(hexdump -s $vtHeadZero -n 512 -e '512/1 "%02X"' $vtfile)
+                vtmagic=$(echo $vtdump | sed 's/^\(00\)*//')
+                let vtoffset="(${#vtdump}-${#vtmagic})/2+$vtHeadZero"                
+                echo "skip head $vtHeadZero zeros with magic ${vtmagic:0:4}" >> $VTLOG
+            else
+                echo "terminate with all zero data file" >> $VTLOG            
+                break
+            fi            
         fi
         
         ventoy_unpack_initramfs $vtfile $vtoffset ${vtmagic:0:4} ${vtfile}_tmp

IMG/cpio/ventoy/loop/LibreELEC/ventoy-disk.sh

@@ -34,9 +34,12 @@ else
     vtBit=32
 fi
 
-xz -d $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dm-mod.ko.xz
-insmod $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dm-mod.ko
-
+if [ -f $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dm-mod.ko.xz ]; then
+    xz -d $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dm-mod.ko.xz
+    insmod $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dm-mod.ko
+elif [ -f $VTOY_PATH/modules/dm-mod.ko ]; then
+    insmod $VTOY_PATH/modules/dm-mod.ko
+fi
 
 wait_for_usb_disk_ready
 

IMG/cpio/ventoy/loop/fwts/ventoy-disk.sh

@@ -0,0 +1,46 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. /ventoy/hook/ventoy-hook-lib.sh
+
+if is_ventoy_hook_finished; then
+    exit 0
+fi
+
+vtlog "####### $0 $* ########"
+
+VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
+
+wait_for_usb_disk_ready
+
+vtdiskname=$(get_ventoy_disk_name)
+if [ "$vtdiskname" = "unknown" ]; then
+    vtlog "ventoy disk not found"
+    PATH=$VTPATH_OLD
+    exit 0
+fi
+
+ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace"
+
+ventoy_create_dev_ventoy_part
+mdev -s
+
+PATH=$VTPATH_OLD
+
+set_ventoy_hook_finish

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

@@ -0,0 +1,23 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. $VTOY_PATH/hook/ventoy-os-lib.sh
+
+$SED  "/^mountroot$/i\\$BUSYBOX_PATH/sh $VTOY_PATH/loop/fwts/ventoy-disk.sh"  -i /init
+#$SED  "/^mountroot$/i\\export ROOT=/dev/mapper/ventoy"  -i /init

IMG/cpio/ventoy/ventoy_chain.sh

@@ -64,9 +64,9 @@ ventoy_get_os_type() {
     elif $GREP -q '[Uu]buntu' /proc/version; then
         echo 'debian'; return
         
-    # Deepin : do the same process with debian
+    # Deepin :
     elif $GREP -q '[Dd]eepin' /proc/version; then
-        echo 'debian'; return
+        echo 'deepin'; return
 
     # rhel5/CentOS5 and all other distributions based on them
     elif $GREP -q 'el5' /proc/version; then
@@ -169,9 +169,9 @@ ventoy_get_os_type() {
         elif $GREP -q 'fuyu' /etc/os-release; then
             echo 'openEuler'; return
         elif $GREP -q 'deepin' /etc/os-release; then
-            echo 'debian'; return
+            echo 'deepin'; return
         elif $GREP -q 'chinauos' /etc/os-release; then
-            echo 'debian'; return
+            echo 'deepin'; return
         fi
     fi
     
@@ -229,6 +229,10 @@ ventoy_get_os_type() {
         echo 'android'; return
     fi 
     
+    if $GREP -q 'android.google' /proc/version; then
+        echo 'android'; return
+    fi
+    
     if $GREP -q 'adelielinux' /proc/version; then
         echo 'adelie'; return
     fi
@@ -369,6 +373,23 @@ ventoy_get_os_type() {
         fi
     fi
     
+    if $GREP -q 'chimera' /proc/version; then
+        echo 'chimera'; return
+    fi
+
+    
+    if $GREP -q '4.19.' /proc/version; then
+        if [ -d /lib/dracut/hooks ]; then
+            echo 'openEuler'; return
+        fi
+    fi
+    
+    if [ -f /etc/tinyramfs/config ]; then
+        if $GREP -q 'EWE_ISO' /etc/tinyramfs/config; then
+            echo "ewe"; return
+        fi
+    fi
+    
     
     echo "default"
 }

INSTALL/ExtendPersistentImg.sh

@@ -4,8 +4,9 @@ print_usage() {
     echo 'Usage:  ExtendPersistentImg.sh file size'
     echo '   file   persistent dat file'
     echo '   size   extend size in MB'
-    echo 'Example:'
-    echo '   sh ExtendPersistentImg.sh ubuntu.dat 2048'
+    echo 'Examples:'
+    echo '   sh ExtendPersistentImg.sh ubuntu.dat 2048 - This command would extend ubuntu.dat by 2048MB (2GB)'
+    echo '   sh ExtendPersistentImg.sh ubuntu.dat -2048 - This command reduces ubuntu.dat by 2048MB (-2GB)'
     echo ''
 }
 
@@ -19,6 +20,11 @@ if [ -z "$2" ]; then
     exit 1
 fi
 
+uid=$(id -u)
+if [ $uid -ne 0 ]; then
+    print_err "Please use sudo or run the script as root."
+    exit 1
+fi
 
 if [ "$1" = "__vbash__" ]; then
     shift

INSTALL/README

@@ -1,7 +1,7 @@
 
 ========== Ventoy2Disk.sh ===============
 
-sudo sh Ventoy2Disk.sh { -i | -I | -u } /dev/sdX   sdX is the USB device, for example /dev/sdb.
+sudo bash Ventoy2Disk.sh { -i | -I | -u } /dev/sdX   sdX is the USB device, for example /dev/sdb.
 
 Ventoy2Disk.sh CMD [ OPTION ] /dev/sdX
   CMD:
@@ -18,16 +18,16 @@ Please refer https://www.ventoy.net/en/doc_start.html for details.
 
 
 ========== VentoyWeb.sh ===============
-1. sudo sh VentoyWeb.sh 
+1. sudo bash VentoyWeb.sh 
 2. open your browser and visit http://127.0.0.1:24680
 
 
 ========== VentoyPlugson.sh ===============
-1. sudo sh VentoyPlugson.sh 
+1. sudo bash VentoyPlugson.sh /dev/sdX
 2. open your browser and visit http://127.0.0.1:24681
 
 ========== VentoyVlnk.sh ===============
-Usage:  sudo sh VentoyVlnk.sh CMD FILE
+Usage:  sudo bash VentoyVlnk.sh CMD FILE
   CMD:
    -c FILE      create vlnk for FILE
    -l VLNK      parse vlnk file
@@ -43,21 +43,21 @@ VentoyGUI is native GUI program for Linux (GTK/QT)
 
 ========== CreatePersistentImg.sh ===============
 
-sudo sh CreatePersistentImg.sh  [ -s SIZE_IN_MB ] [ -t FSTYPE ] [ -l LABEL ]   for example:
+sudo bash CreatePersistentImg.sh  [ -s SIZE_IN_MB ] [ -t FSTYPE ] [ -l LABEL ]   for example:
 
-sh CreatePersistentImg.sh                 ---->  persistence.dat in 1GB size and ext4 filesystem and casper-rw label
-sh CreatePersistentImg.sh -l MX-Persist   ---->  persistence.dat in 1GB size and ext4 filesystem and MX-Persist label
-sh CreatePersistentImg.sh -s 2048         ---->  persistence.dat in 2GB size and ext4 filesystem and casper-rw label
-sh CreatePersistentImg.sh -s 4096 -t xfs  ---->  persistence.dat in 4GB size and xfs  filesystem  (ext2/3/4 xfs are supported)  and casper-rw label
+bash CreatePersistentImg.sh                 ---->  persistence.dat in 1GB size and ext4 filesystem and casper-rw label
+bash CreatePersistentImg.sh -l MX-Persist   ---->  persistence.dat in 1GB size and ext4 filesystem and MX-Persist label
+bash CreatePersistentImg.sh -s 2048         ---->  persistence.dat in 2GB size and ext4 filesystem and casper-rw label
+bash CreatePersistentImg.sh -s 4096 -t xfs  ---->  persistence.dat in 4GB size and xfs  filesystem  (ext2/3/4 xfs are supported)  and casper-rw label
 
 Please refer https://www.ventoy.net/en/plugin_persistence.html for details.
 
 
 
 ========== ExtendPersistentImg.sh ===============
-sudo sh ExtendPersistentImg.sh  file size   
+sudo bash ExtendPersistentImg.sh  file size   
 For example:
-sh ExtendPersistentImg.sh persistence.dat 2048  ---->  Extend persistence.dat by 2048MB
+bash ExtendPersistentImg.sh persistence.dat 2048  ---->  Extend persistence.dat by 2048MB
 That is to say, persistence.dat file will grow to 3GB size (assume that it is 1GB size before extend)
 
 Please refer https://www.ventoy.net/en/plugin_persistence.html for details.

INSTALL/Ventoy2Disk.sh

@@ -12,11 +12,11 @@ if [ -f ./ventoy/version ]; then
     curver=$(cat ./ventoy/version) 
 fi
 
-if uname -m | egrep -q 'aarch64|arm64'; then
+if uname -m | grep -E -q 'aarch64|arm64'; then
     export TOOLDIR=aarch64
-elif uname -m | egrep -q 'x86_64|amd64'; then
+elif uname -m | grep -E -q 'x86_64|amd64'; then
     export TOOLDIR=x86_64
-elif uname -m | egrep -q 'mips64'; then
+elif uname -m | grep -E -q 'mips64'; then
     export TOOLDIR=mips64el
 else
     export TOOLDIR=i386

INSTALL/VentoyPlugson.sh

@@ -30,13 +30,13 @@ fi
 OLDDIR=$(pwd)
 
 machine=$(uname -m)
-if echo $machine | egrep -q 'aarch64|arm64'; then
+if echo $machine | grep -E -q 'aarch64|arm64'; then
     TOOLDIR=aarch64
-elif echo $machine | egrep -q 'x86_64|amd64'; then
+elif echo $machine | grep -E -q 'x86_64|amd64'; then
     TOOLDIR=x86_64
-elif echo $machine | egrep -q 'mips64'; then
+elif echo $machine | grep -E -q 'mips64'; then
     TOOLDIR=mips64el
-elif echo $machine | egrep -q 'i[3-6]86'; then
+elif echo $machine | grep -E -q 'i[3-6]86'; then
     TOOLDIR=i386
 else
     echo "Unsupported machine type $machine"    
@@ -122,7 +122,7 @@ if echo $DISK | grep -q "[a-z]d[a-z][1-9]"; then
     DISK=${DISK:0:-1}
 fi
 
-if echo $DISK | egrep -q "/dev/nvme|/dev/mmcblk/dev/nbd"; then
+if echo $DISK | grep -E -q "/dev/nvme|/dev/mmcblk/dev/nbd"; then
     if echo $DISK | grep -q "p[1-9]$"; then
         DISK=${DISK:0:-2}
     fi
@@ -196,7 +196,7 @@ fi
 
 #change current directory to Ventoy disk
 cd "$mtpnt"
-$OLDDIR/tool/$TOOLDIR/Plugson "$HOST" "$PORT" "$OLDDIR" "$DISK" $version "$fstype" $partstyle $secureboot   &
+"$OLDDIR/tool/$TOOLDIR/Plugson" "$HOST" "$PORT" "$OLDDIR" "$DISK" $version "$fstype" $partstyle $secureboot   &
 wID=$!
 sleep 1
 

INSTALL/VentoyWeb.sh

@@ -23,11 +23,11 @@ fi
 
 OLDDIR=$(pwd)
 
-if uname -m | egrep -q 'aarch64|arm64'; then
+if uname -m | grep -E -q 'aarch64|arm64'; then
     TOOLDIR=aarch64
-elif uname -m | egrep -q 'x86_64|amd64'; then
+elif uname -m | grep -E -q 'x86_64|amd64'; then
     TOOLDIR=x86_64
-elif uname -m | egrep -q 'mips64'; then
+elif uname -m | grep -E -q 'mips64'; then
     TOOLDIR=mips64el
 else
     TOOLDIR=i386

INSTALL/docker_ci_build.sh

@@ -3,7 +3,7 @@
 VTOY_PATH=$PWD/..
 
 date +"%Y/%m/%d %H:%M:%S"
-echo downloading envrionment ...
+echo downloading environment ...
 
 wget -q -P $VTOY_PATH/DOC/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/dietlibc-0.34.tar.xz
 wget -q -P $VTOY_PATH/DOC/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/musl-1.2.1.tar.gz
@@ -14,6 +14,6 @@ wget -q -P /opt/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/a
 wget -q -P /opt/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz
 
 date +"%Y/%m/%d %H:%M:%S"
-echo downloading envrionment finish...
+echo downloading environment finish...
 
 sh all_in_one.sh CI

INSTALL/grub/checksum.cfg

@@ -1,117 +1,96 @@
 
-if [ -e "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.md5" ]; then
-    set default=0
-    menuentry "@VTMENU_CHKSUM_MD5_CALC_CHK" --class=checksum_md5 {
+unset vtchkdef
+vt_vtoychksum_exist "${VTOY_CHKSUM_FILE_PATH}" 
+
+if [ "$VT_EXIST_MD5" = "1" ]; then
+    if [ -z "$vtchkdef" ]; then
+        set default=0
+        set vtchkdef=1
+    fi
+    menuentry "$VTLANG_CHKSUM_MD5_CALC_CHK" --class=checksum_md5 {
+        md5sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"       
+        vt_cmp_checksum 0 "${VTOY_CHKSUM_FILE_PATH}"
+
+        echo -en "\n\n$VTLANG_ENTER_EXIT ..."
+        read vtInputKey
+    }
+else
+    menuentry "$VTLANG_CHKSUM_MD5_CALC" --class=checksum_md5 {
         md5sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
         
-        vt_1st_line "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.md5" vtReadChecksum
-                
-        if vt_str_casebegin "$vtReadChecksum" "$VT_LAST_CHECK_SUM"; then
-            echo -e "\n\nCheck MD5 value with .md5 file.  [ OK ]"
-        else
-            echo -e "\n\nCheck MD5 value with .md5 file.  [ FAIL ]"
-            echo "The MD5 value in .md5 file is:"
-            echo "$vtReadChecksum"
-        fi
-        
-        echo -e "\n\npress ENTER to exit ..."
-        read vtInputKey
-    }
-else
-    menuentry "@VTMENU_CHKSUM_MD5_CALC" --class=checksum_md5 {
-        md5sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
-        
-        echo -e "\n\npress ENTER to exit ..."
+        echo -en "\n\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
     }
 fi
 
-if [ -e "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha1" ]; then
-    set default=1
-    menuentry "@VTMENU_CHKSUM_SHA1_CALC_CHK" --class=checksum_sha1 {
+if [ "$VT_EXIST_SHA1" = "1" ]; then
+    if [ -z "$vtchkdef" ]; then
+        set default=1
+        set vtchkdef=1
+    fi
+    menuentry "$VTLANG_CHKSUM_SHA1_CALC_CHK" --class=checksum_sha1 {
+        sha1sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
+        vt_cmp_checksum 1 "${VTOY_CHKSUM_FILE_PATH}" 
+        
+        echo -en "\n\n$VTLANG_ENTER_EXIT ..."
+        read vtInputKey
+    }
+else
+    menuentry "$VTLANG_CHKSUM_SHA1_CALC" --class=checksum_sha1 {
         sha1sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
         
-        vt_1st_line "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha1" vtReadChecksum
-        
-        if vt_str_casebegin "$vtReadChecksum" "$VT_LAST_CHECK_SUM"; then
-            echo -e "\n\nCheck SHA1 value with .sha1 file.  [ OK ]"
-        else
-            echo -e "\n\nCheck SHA1 value with .sha1 file.  [ FAIL ]"
-            echo "The SHA1 value in .sha1 file is:"
-            echo "$vtReadChecksum"
-        fi
-        
-        echo -e "\n\npress ENTER to exit ..."
-        read vtInputKey
-    }
-else
-    menuentry "@VTMENU_CHKSUM_SHA1_CALC" --class=checksum_sha1 {
-        sha1sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
-        
-        echo -e "\n\npress ENTER to exit ..."
+        echo -en "\n\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
     }
 fi
 
 
 
-if [ -e "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha256" ]; then
-    set default=2
-    menuentry "@VTMENU_CHKSUM_SHA256_CALC_CHK" --class=checksum_sha256 {
+if [ "$VT_EXIST_SHA256" = "1" ]; then
+    if [ -z "$vtchkdef" ]; then
+        set default=2
+        set vtchkdef=1
+    fi
+    menuentry "$VTLANG_CHKSUM_SHA256_CALC_CHK" --class=checksum_sha256 {
+        sha256sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
+        vt_cmp_checksum 2 "${VTOY_CHKSUM_FILE_PATH}"         
+        
+        echo -en "\n\n$VTLANG_ENTER_EXIT ..."
+        read vtInputKey
+    }
+else
+    menuentry "$VTLANG_CHKSUM_SHA256_CALC" --class=checksum_sha256 {
         sha256sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
         
-        vt_1st_line "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha256" vtReadChecksum
-        
-        if vt_str_casebegin "$vtReadChecksum" "$VT_LAST_CHECK_SUM"; then
-            echo -e "\n\nCheck SHA256 value with .sha256 file.  [ OK ]"
-        else
-            echo -e "\n\nCheck SHA256 value with .sha256 file.  [ FAIL ]"
-            echo "The SHA256 value in .sha256 file is:"
-            echo "$vtReadChecksum"
-        fi
-        
-        echo -e "\n\npress ENTER to exit ..."
-        read vtInputKey
-    }
-else
-    menuentry "@VTMENU_CHKSUM_SHA256_CALC" --class=checksum_sha256 {
-        sha256sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
-        
-        echo -e "\n\npress ENTER to exit ..."
+        echo -en "\n\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
     }
 fi
 
 
 
-if [ -e "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha512" ]; then
-    set default=3
-    menuentry "@VTMENU_CHKSUM_SHA512_CALC_CHK" --class=checksum_sha512{
+if [ "$VT_EXIST_SHA512" = "1" ]; then
+    if [ -z "$vtchkdef" ]; then
+        set default=3
+        set vtchkdef=1
+    fi
+    menuentry "$VTLANG_CHKSUM_SHA512_CALC_CHK" --class=checksum_sha512{
         sha512sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
+        vt_cmp_checksum 3 "${VTOY_CHKSUM_FILE_PATH}"        
         
-        vt_1st_line "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha512" vtReadChecksum
-        
-        if vt_str_casebegin "$vtReadChecksum" "$VT_LAST_CHECK_SUM"; then
-            echo -e "\n\nCheck SHA512 value with .sha512 file.  [ OK ]"
-        else
-            echo -e "\n\nCheck SHA512 value with .sha512 file.  [ FAIL ]"
-            echo "The SHA512 value in .sha512 file is:"
-            echo "$vtReadChecksum"
-        fi
-        
-        echo -e "\n\npress ENTER to exit ..."
+        echo -en "\n\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
     }
 else
-    menuentry "@VTMENU_CHKSUM_SHA512_CALC" --class=checksum_sha512{
+    menuentry "$VTLANG_CHKSUM_SHA512_CALC" --class=checksum_sha512{
         sha512sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
         
-        echo -e "\n\npress ENTER to exit ..."
+        echo -en "\n\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
     }
 fi
 
 
-menuentry '@VTMENU_RETURN_PREVIOUS' --class=vtoyret VTOY_RET {
+menuentry "$VTLANG_RETURN_PREVIOUS" --class=vtoyret VTOY_RET {
     echo 'Return ...'
 }

INSTALL/grub/debug.cfg

@@ -1,14 +1,61 @@
+#
+# VTLANG_CTRL_TEMP_SET must be the first
+# And the inside item order can not be changed
+#
+submenu "$VTLANG_CTRL_TEMP_SET" --class=debug_temp_set --class=F5tool {
+    menuentry "[ $VTOY_WIN11_BYPASS_CHECK ]  $VTLANG_WIN11_BYPASS_CHECK" --class=debug_temp_win11_bypass --class=debug_temp_set --class=F5tool \
+        VTOY_RUN_SET0 {
+        if [ "$VTOY_WIN11_BYPASS_CHECK" = "0" ]; then
+            set VTOY_WIN11_BYPASS_CHECK=1
+        else
+            set VTOY_WIN11_BYPASS_CHECK=0
+        fi
+    }
+    
+    menuentry "[ $VTOY_WIN11_BYPASS_NRO ]  $VTLANG_WIN11_BYPASS_NRO" --class=debug_temp_win11_nro --class=debug_temp_set --class=F5tool \
+        VTOY_RUN_SET1 {
+        if [ "$VTOY_WIN11_BYPASS_NRO" = "0" ]; then
+            set VTOY_WIN11_BYPASS_NRO=1
+        else
+            set VTOY_WIN11_BYPASS_NRO=0
+        fi
+    }
+    
+    menuentry "[ $VTOY_LINUX_REMOUNT ]  $VTLANG_LINUX_REMOUNT" --class=debug_temp_linux_remount --class=debug_temp_set --class=F5tool \
+        VTOY_RUN_SET2 {
+        if [ "$VTOY_LINUX_REMOUNT" = "0" ]; then
+            set VTOY_LINUX_REMOUNT=1
+        else
+            set VTOY_LINUX_REMOUNT=0
+        fi
+    }
+    
+    menuentry "[ $VTOY_SECONDARY_BOOT_MENU ]  $VTLANG_SECONDARY_BOOT_MENU" --class=debug_temp_second_menu --class=debug_temp_set --class=F5tool \
+        VTOY_RUN_SET3 {
+        if [ "$VTOY_SECONDARY_BOOT_MENU" = "0" ]; then
+            set VTOY_SECONDARY_BOOT_MENU=1
+        else
+            set VTOY_SECONDARY_BOOT_MENU=0
+        fi
+    }
 
-submenu "@VTMENU_MENU_LANG" --class=debug_menu_lang --class=F5tool {
+    menuentry "$VTLANG_RETURN_PREVIOUS" --class=vtoyret VTOY_RET {
+        echo "Return ..."
+    }
+}
+
+
+submenu "$VTLANG_MENU_LANG" --class=debug_menu_lang --class=F5tool {
     source $prefix/menulang.cfg
 }
+
 source $prefix/power.cfg
 source $prefix/hwinfo.cfg
 source $prefix/keyboard.cfg
 
-submenu "@VTMENU_RESOLUTION_CFG" --class=debug_resolution --class=F5tool {
-    menuentry '@VTMENU_RETURN_PREVIOUS' --class=vtoyret VTOY_RET {
-        echo 'Return ...'
+submenu "$VTLANG_RESOLUTION_CFG" --class=debug_resolution --class=F5tool {
+    menuentry "$VTLANG_RETURN_PREVIOUS" --class=vtoyret VTOY_RET {
+        echo "Return ..."
     }
     
     vt_update_cur_video_mode VT_CUR_MODE
@@ -24,192 +71,197 @@ submenu "@VTMENU_RESOLUTION_CFG" --class=debug_resolution --class=F5tool {
         menuentry "$vtCurMode $vtActive" --class=debug_videomode --class=debug_resolution --class=F5tool VTOY_RUN_RET {
             terminal_output console
             set gfxmode=$1
-            terminal_output gfxterm
+            terminal_output gfxterm            
+            if [ "$vtoy_res_fit" = "1" ]; then
+                vt_set_theme switch
+            fi
         }
 
         vt_incr vdid 1
     done
 }
 
-submenu "@VTMENU_SCREEN_MODE" --class=debug_screen_mode --class=F5tool {
-    menuentry '@VTMENU_SCREEN_TEXT_MODE' --class=debug_text_mode --class=debug_screen_mode --class=F5tool {
+submenu "$VTLANG_SCREEN_MODE" --class=debug_screen_mode --class=F5tool {
+    menuentry "$VTLANG_SCREEN_TEXT_MODE" --class=debug_text_mode --class=debug_screen_mode --class=F5tool {
+        vt_push_menu_lang en_US
         terminal_output console
     }
-    menuentry '@VTMENU_SCREEN_GUI_MODE' --class=debug_gui_mode --class=debug_screen_mode --class=F5tool {
+    menuentry "$VTLANG_SCREEN_GUI_MODE" --class=debug_gui_mode --class=debug_screen_mode --class=F5tool {
         terminal_output gfxterm
+        vt_pop_menu_lang
     }
-    menuentry '@VTMENU_RETURN_PREVIOUS' --class=vtoyret VTOY_RET {
-        echo 'Return ...'
+    menuentry "$VTLANG_RETURN_PREVIOUS" --class=vtoyret VTOY_RET {
+        echo "Return ..."
     }
 }
 
 if [ -n "$VTOY_THEME_COUNT" -a $VTOY_THEME_COUNT -gt 1 ]; then
-    submenu "@VTMENU_THEME_SELECT" --class=debug_theme_select --class=F5tool {
+    submenu "$VTLANG_THEME_SELECT" --class=debug_theme_select --class=F5tool {
         vt_select_theme_cfg
     }
 fi
 
 if [ "$grub_platform" != "pc" ]; then
-    submenu 'Ventoy UEFI Utilities' --class=debug_util --class=F5tool {
-        menuentry '@VTMENU_UTIL_SHOW_EFI_DRV' --class=debug_util_efidrv --class=debug_util --class=F5tool {
+    submenu "$VTLANG_UEFI_UTIL" --class=debug_util --class=F5tool {
+        menuentry "$VTLANG_UTIL_SHOW_EFI_DRV" --class=debug_util_efidrv --class=debug_util --class=F5tool {
             vt_push_pager
             chainloader ${vtoy_path}/vtoyutil_${VTOY_EFI_ARCH}.efi env_param=${env_param} ${vtdebug_flag} feature=show_efi_drivers
             boot
             vt_pop_pager
-            echo -e "\npress ENTER to exit ..."
+            echo -en "\n$VTLANG_ENTER_EXIT ..."
             read vtInputKey
         }
         
-        menuentry '@VTMENU_UTIL_FIX_BLINIT_FAIL' --class=debug_util_blinit --class=debug_util --class=F5tool {
+        menuentry "$VTLANG_UTIL_FIX_BLINIT_FAIL" --class=debug_util_blinit --class=debug_util --class=F5tool {
             chainloader ${vtoy_path}/vtoyutil_${VTOY_EFI_ARCH}.efi env_param=${env_param} ${vtdebug_flag} feature=fix_windows_mmap
             boot
-            echo -e "\npress ENTER to exit ..."
+            echo -en "\n$VTLANG_ENTER_EXIT ..."
             read vtInputKey
         }
 
-        menuentry '@VTMENU_RETURN_PREVIOUS' --class=vtoyret VTOY_RET {
-            echo 'Return ...'
+        menuentry "$VTLANG_RETURN_PREVIOUS" --class=vtoyret VTOY_RET {
+            echo "Return ..."
         }
     }
 fi
 
 
-submenu '@VTMENU_JSON_CHK_JSON' --class=debug_json --class=F5tool {
-    menuentry '@VTMENU_JSON_CHK_CONTROL' --class=debug_control --class=debug_json --class=F5tool {
+submenu "$VTLANG_JSON_CHK_JSON" --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_CONTROL" --class=debug_control --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path control $vtoy_iso_part
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     }
     
-    menuentry '@VTMENU_JSON_CHK_THEME' --class=debug_theme --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_THEME" --class=debug_theme --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path theme $vtoy_iso_part
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     }
     
-    menuentry '@VTMENU_JSON_CHK_AUTOINS' --class=debug_autoinstall --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_AUTOINS" --class=debug_autoinstall --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path auto_install $vtoy_iso_part
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     }
     
-    menuentry '@VTMENU_JSON_CHK_PERSIST' --class=debug_persistence --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_PERSIST" --class=debug_persistence --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path persistence $vtoy_iso_part
         
         echo -e "\n############### dump persistence ###############"
         vt_dump_persistence
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     }
     
-    menuentry '@VTMENU_JSON_CHK_MENU_ALIAS' --class=debug_menualias --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_MENU_ALIAS" --class=debug_menualias --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path menu_alias $vtoy_iso_part
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     }
     
-    menuentry '@VTMENU_JSON_CHK_MENU_TIP' --class=debug_menutip --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_MENU_TIP" --class=debug_menutip --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path menu_tip $vtoy_iso_part
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     }
     
-    menuentry '@VTMENU_JSON_CHK_MENU_CLASS' --class=debug_menuclass --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_MENU_CLASS" --class=debug_menuclass --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path menu_class $vtoy_iso_part
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     }  
 
-    menuentry '@VTMENU_JSON_CHK_INJECTION' --class=debug_injection --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_INJECTION" --class=debug_injection --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path injection $vtoy_iso_part
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     } 
 
-    menuentry '@VTMENU_JSON_CHK_AUTO_MEMDISK' --class=debug_automemdisk --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_AUTO_MEMDISK" --class=debug_automemdisk --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path auto_memdisk $vtoy_iso_part
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     }  
 
-    menuentry '@VTMENU_JSON_CHK_IMG_LIST' --class=debug_imagelist --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_IMG_LIST" --class=debug_imagelist --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path image_list $vtoy_iso_part
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     }
     
-    menuentry '@VTMENU_JSON_CHK_IMG_BLIST' --class=debug_imageblacklist --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_IMG_BLIST" --class=debug_imageblacklist --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path image_blacklist $vtoy_iso_part
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     }
     
-    menuentry '@VTMENU_JSON_CHK_CONF_REPLACE' --class=debug_bootconf_replace --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_CONF_REPLACE" --class=debug_bootconf_replace --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path conf_replace $vtoy_iso_part
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     }
     
-    menuentry '@VTMENU_JSON_CHK_DUD' --class=debug_dud --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_DUD" --class=debug_dud --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path dud $vtoy_iso_part
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     }
     
-    menuentry '@VTMENU_JSON_CHK_PASSWORD' --class=debug_pwd --class=debug_json --class=F5tool {
+    menuentry "$VTLANG_JSON_CHK_PASSWORD" --class=debug_pwd --class=debug_json --class=F5tool {
         set pager=1
         vt_check_plugin_json $vt_plugin_path password $vtoy_iso_part
         
-        echo -e "\npress ENTER to exit ..."
+        echo -en "\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
         unset pager
     }
     
-    menuentry '@VTMENU_RETURN_PREVIOUS' --class=vtoyret VTOY_RET {
-        echo 'Return ...'
+    menuentry "$VTLANG_RETURN_PREVIOUS" --class=vtoyret VTOY_RET {
+        echo "Return ..."
     }
 }
 
 
-menuentry '@VTMENU_RETURN_PREVIOUS' --class=vtoyret VTOY_RET {
-    echo 'Return ...'
+menuentry "$VTLANG_RETURN_PREVIOUS" --class=vtoyret VTOY_RET {
+    echo "Return ..."
 }

INSTALL/grub/distro/fwts.cfg

@@ -0,0 +1,15 @@
+set label="writable"
+
+menuentry 'Firmware Test Suite' --class ubuntu --class gnu-linux --class gnu --class os {
+    set root='vtimghd,4'
+    linux   /boot/vmlinuz root=LABEL=$label ro console=tty1 console=ttyS0 quiet
+    initrd  /boot/initrd.img
+}
+
+menuentry 'Firmware Test Suite (recovery mode)' --class ubuntu --class gnu-linux --class gnu --class os {    
+    set root='vtimghd,4'    
+    echo    'Loading Linux ...'
+    linux   /boot/vmlinuz root=LABEL=$label ro recovery nomodeset
+    echo    'Loading initial ramdisk ...'
+    initrd  /boot/initrd.img
+}

INSTALL/grub/grub.cfg

@@ -16,6 +16,11 @@
 # 
 #************************************************************************************
 
+if [ "$grub_platform" = "pc" ]; then
+    insmod setkey
+    insmod regexp
+fi
+
 function ventoy_pause {
     echo "press Enter to continue ......"
     read vtTmpPause
@@ -85,7 +90,7 @@ function ventoy_ext_menu {
         unset ventoy_new_context
     else
        echo "ventoy_grub.cfg NOT exist."
-       echo -e "\npress ENTER to exit ..."
+       echo -en "\n$VTLANG_ENTER_EXIT ..."
        read vtInputKey
     fi
 }
@@ -114,13 +119,14 @@ function ventoy_show_help {
 }
 
 function ventoy_load_menu_lang_file {
-    vt_load_file_to_mem "auto" $vtoy_efi_part/grub/menu.tar.gz vtoy_menu_lang_mem
+    vt_load_file_to_mem "auto" $prefix/menu.tar.gz vtoy_menu_lang_mem
     loopback vt_menu_tarfs mem:${vtoy_menu_lang_mem_addr}:size:${vtoy_menu_lang_mem_size}    
 }
 
 function get_os_type {
     set vtoy_os=Linux
-    
+    export vtoy_os
+
     if vt_str_begin "$vt_volume_id" "DLC Boot"; then
         if [ -f (loop)/DLCBoot.exe ]; then
             set vtoy_os=Windows
@@ -221,6 +227,8 @@ function distro_specify_wim_patch {
 function distro_specify_wim_patch_phase2 {
     if [ -f (loop)/boot/boot.wim ]; then
         vt_windows_collect_wim_patch wim /boot/boot.wim
+    elif [ -f (loop)/sources/boot.wim ]; then
+        vt_windows_collect_wim_patch wim /sources/boot.wim
     fi
 
     if vt_str_begin "$vt_volume_id" "DLC Boot"; then
@@ -393,20 +401,23 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /boot/full.cz
     elif [ -f (loop)/images/pxeboot/initrd.img ]; then
         vt_linux_specify_initrd_file /images/pxeboot/initrd.img
-
+    elif [ -f (loop)/live/initrd ]; then
+        vt_linux_specify_initrd_file /live/initrd
+    elif [ -f (loop)/initramfs-linux.img ]; then
+        vt_linux_specify_initrd_file /initramfs-linux.img
     fi
 }
 
+
 function ventoy_get_ghostbsd_ver {
     # fallback to parse version from elf /boot/kernel/kernel
     set vt_freebsd_ver=xx
 }
 
 function ventoy_get_furybsd_ver {
-    if regexp "13\.[0-9]" "$2"; then
-        set vt_freebsd_ver=13.x
-    else
-        set vt_freebsd_ver=12.x
+    set vt_freebsd_ver=12.x
+    if regexp --set 1:vtFuryVer "(14|13)\.[0-9]" "$2"; then
+        set vt_freebsd_ver=${vtFuryVer}.x
     fi
 }
 
@@ -415,12 +426,8 @@ function ventoy_get_freenas_ver {
 
     if [ -e (loop)/FreeNAS-MANIFEST ]; then
         vt_parse_freenas_ver (loop)/FreeNAS-MANIFEST vt_freenas_ver
-        if regexp "^13\.[0-9]" "$vt_freenas_ver"; then
-            set vt_freebsd_ver=13.x
-        elif regexp "^12\.[0-9]" "$vt_freenas_ver"; then
-            set vt_freebsd_ver=12.x
-        elif regexp "^11\.[0-9]" "$vt_freenas_ver"; then
-            set vt_freebsd_ver=11.x
+        if regexp --set 1:vtNasVer "^(14|13|12|11)\.[0-9]" "$vt_freenas_ver"; then
+            set vt_freebsd_ver=${vtNasVer}.x        
         fi
     fi
 }
@@ -430,12 +437,8 @@ function ventoy_get_truenas_ver {
 
     if [ -e (loop)/TrueNAS-MANIFEST ]; then
         vt_parse_freenas_ver (loop)/TrueNAS-MANIFEST vt_truenas_ver
-        if regexp "^13\.[0-9]" "$vt_truenas_ver"; then
-            set vt_freebsd_ver=13.x
-        elif regexp "^12\.[0-9]" "$vt_truenas_ver"; then
-            set vt_freebsd_ver=12.x
-        elif regexp "^11\.[0-9]" "$vt_truenas_ver"; then
-            set vt_freebsd_ver=11.x
+        if regexp --set 1:vtTNasVer "^(14|13|12|11)\.[0-9]" "$vt_truenas_ver"; then
+            set vt_freebsd_ver=${vtTNasVer}.x        
         fi
     fi
 }
@@ -467,49 +470,25 @@ function ventoy_freebsd_proc {
         ventoy_get_truenas_ver "$1" "${chosen_path}"
     elif vt_strstr "$vt_volume_id" "FURYBSD"; then
         ventoy_get_furybsd_ver "$1" "${chosen_path}"  
-    elif regexp "^13_[0-9]" "$vt_volume_id"; then
-        set vt_freebsd_ver=13.x
-    elif regexp "^12_[0-9]" "$vt_volume_id"; then
-        set vt_freebsd_ver=12.x
-    elif regexp "^11_[0-9]" "$vt_volume_id"; then
-        set vt_freebsd_ver=11.x
-    elif regexp "^10_[0-9]" "$vt_volume_id"; then
-        set vt_freebsd_ver=10.x
-    elif regexp "^9_[0-9]" "$vt_volume_id"; then
-        set vt_freebsd_ver=9.x
+    elif regexp --set 1:vtBsdVerNum "^(14|13|12|11|10|9)_[0-9]" "$vt_volume_id"; then
+        set vt_freebsd_ver=${vtBsdVerNum}.x    
     elif [ -d (loop)/usr/midnightbsd-dist ]; then
         ventoy_get_midnightbsd_ver "$1" "${chosen_path}"
         set vtFreeBsdDistro=MidnightBSD
     elif [ -e (loop)/bin/freebsd-version ]; then
-        vt_unix_parse_freebsd_ver (loop)/bin/freebsd-version vt_userland_ver
-        if regexp "\"13\.[0-9]-" "$vt_userland_ver"; then
-            set vt_freebsd_ver=13.x
-        elif regexp "\"12\.[0-9]-" "$vt_userland_ver"; then
-            set vt_freebsd_ver=12.x
-        elif regexp "\"11\.[0-9]-" "$vt_userland_ver"; then
-            set vt_freebsd_ver=11.x
-        elif regexp "\"10\.[0-9]-" "$vt_userland_ver"; then
-            set vt_freebsd_ver=10.x
-        elif regexp "\"9\.[0-9]-" "$vt_userland_ver"; then
-            set vt_freebsd_ver=9.x
-        fi
+        vt_unix_parse_freebsd_ver (loop)/bin/freebsd-version vt_userland_ver        
+        if regexp --set 1:vtBsdVerNum "\"(14|13|12|11|10|9)\.[0-9]-" "$vt_userland_ver"; then
+            set vt_freebsd_ver=${vtBsdVerNum}.x
+        fi        
     elif [ -e (loop)/README.TXT ]; then
         vt_1st_line (loop)/README.TXT vt_freebsd_line1
-        if regexp "FreeBSD 13\.[0-9]-" "$vt_freebsd_line1"; then
-            set vt_freebsd_ver=13.x
-        elif regexp "FreeBSD 12\.[0-9]-" "$vt_freebsd_line1"; then
-            set vt_freebsd_ver=12.x
-        elif regexp "FreeBSD 11\.[0-9]-" "$vt_freebsd_line1"; then
-            set vt_freebsd_ver=11.x
-        elif regexp "FreeBSD 10\.[0-9]-" "$vt_freebsd_line1"; then
-            set vt_freebsd_ver=10.x
-        elif regexp "FreeBSD 9\.[0-9]-" "$vt_freebsd_line1"; then
-            set vt_freebsd_ver=9.x
+        if regexp --set 1:vtBsdVerNum "FreeBSD (14|13|12|11|10|9)\.[0-9]-" "$vt_freebsd_line1"; then
+            set vt_freebsd_ver=${vtBsdVerNum}.x        
         fi
     elif vt_strstr "${chosen_path}" "MidnightBSD"; then
         set vt_freebsd_ver=9.x
     fi
-    
+
     
     if [ -e (loop)/usr/freebsd-dist/cloninst.sh ]; then
         set vtFreeBsdDistro=ClonOS
@@ -533,7 +512,7 @@ function ventoy_freebsd_proc {
         fi
         
         if [ "$vt_freebsd_ver" = "xx" ]; then
-            set vt_freebsd_ver=13.x        
+            set vt_freebsd_ver=14.x
         fi
     fi
 
@@ -846,6 +825,16 @@ function uefi_linux_menu_func {
                 configfile "mem:${vt_sys_menu_mem_addr}:size:${vt_sys_menu_mem_size}"
             fi
         fi
+        
+        if [ $vtback_cfg_find -eq 0 ]; then
+            if [ -f (loop)/boot/isolinux/syslnx64.cfg ]; then
+                syslinux_configfile (loop)/boot/isolinux/syslnx64.cfg
+                set vtback_cfg_find=1
+            elif [ -f (loop)/boot/syslinux/porteus.cfg ]; then
+                syslinux_configfile (loop)/boot/syslinux/porteus.cfg
+                set vtback_cfg_find=1
+            fi
+        fi
 
         if [ "$vtback_cfg_find" = "0" ]; then
             echo " "
@@ -891,11 +880,6 @@ function ventoy_reset_nojoliet {
 }
 
 function uefi_iso_menu_func {
-
-    if [ -d (loop)/ ]; then
-        loopback -d loop
-    fi
-
     if [ -n "$vtisouefi" ]; then
         set LoadIsoEfiDriver=on
         unset vtisouefi
@@ -909,21 +893,13 @@ function uefi_iso_menu_func {
     vt_select_auto_install "${chosen_path}"
     vt_select_persistence "${chosen_path}"
 
-    if vt_is_udf "${1}${chosen_path}"; then
-        set ventoy_fs_probe=udf
-    else
-        set ventoy_fs_probe=iso9660
-        ventoy_reset_nojoliet
-
+    if ! vt_is_udf "${1}${chosen_path}"; then
         # Lenovo EasyStartup need an addional sector for boundary check
         if vt_str_begin "$vt_volume_id" "EasyStartup"; then
             vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}"
             vt_append_extra_sector 1
         fi
     fi
-
-    loopback loop "${1}${chosen_path}"
-    get_os_type (loop)
     
     if [ -d (loop)/EFI ]; then
         set vt_efi_dir=YES
@@ -942,15 +918,6 @@ function uefi_iso_menu_func {
         vt_check_compatible (loop)        
     fi
     
-    if vt_need_secondary_menu "$vt_chosen_name"; then
-        vt_show_secondary_menu "$vt_chosen_path" "$vtoy_os" $vt_chosen_size
-        if vt_check_mode 0 "$vt_chosen_name"; then
-            uefi_iso_memdisk $vtoy_iso_part  "$vt_chosen_path"
-            vt_secondary_recover_mode
-            return
-        fi
-    fi
-    
     vt_img_sector "${1}${chosen_path}"
     
     if [ "$ventoy_fs_probe" = "iso9660" ]; then
@@ -967,8 +934,7 @@ function uefi_iso_menu_func {
         uefi_linux_menu_func  "$1" "${chosen_path}"
     fi
 
-    ventoy_gui_console
-    vt_secondary_recover_mode
+    ventoy_gui_console    
 }
 
 function uefi_iso_memdisk {    
@@ -1313,6 +1279,16 @@ function legacy_linux_menu_func {
                     configfile "mem:${vt_sys_menu_mem_addr}:size:${vt_sys_menu_mem_size}"
                 fi
             fi
+            
+            if [ $vtback_cfg_find -eq 0 ]; then
+                if [ -f (loop)/boot/isolinux/syslnx64.cfg ]; then
+                    syslinux_configfile (loop)/boot/isolinux/syslnx64.cfg
+                    set vtback_cfg_find=1
+                elif [ -f (loop)/boot/syslinux/porteus.cfg ]; then
+                    syslinux_configfile (loop)/boot/syslinux/porteus.cfg
+                    set vtback_cfg_find=1
+                fi
+            fi
 
             vt_unset_boot_opt
             set root=$vtback_root        
@@ -1346,26 +1322,10 @@ function legacy_unix_menu_func {
 
 
 function legacy_iso_menu_func {
-
-    if [ -d (loop)/ ]; then
-        loopback -d loop
-    fi
-
     set chosen_path="$2"
     
     vt_select_auto_install "${chosen_path}"
     vt_select_persistence "${chosen_path}"
-
-    if vt_is_udf "${1}${chosen_path}"; then
-        set ventoy_fs_probe=udf
-    else
-        set ventoy_fs_probe=iso9660
-        ventoy_reset_nojoliet
-    fi
-    
-    loopback loop "${1}${chosen_path}"
-    
-    get_os_type (loop)
     
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
@@ -1376,15 +1336,6 @@ function legacy_iso_menu_func {
         vt_check_compatible (loop)
     fi
     
-    if vt_need_secondary_menu "$vt_chosen_name"; then
-        vt_show_secondary_menu "$vt_chosen_path" "$vtoy_os" $vt_chosen_size  
-        if vt_check_mode 0 "$vt_chosen_name"; then
-            legacy_iso_memdisk $vtoy_iso_part  "$vt_chosen_path"
-            vt_secondary_recover_mode
-            return
-        fi        
-    fi
-
     vt_img_sector "${1}${chosen_path}"
 
     if [ "$ventoy_fs_probe" = "iso9660" ]; then
@@ -1462,6 +1413,8 @@ function ventoy_iso_busybox_ver {
             set ventoy_busybox_ver=64
         elif vt_str_begin "$vt_volume_id" "LDiagBootable"; then
             set ventoy_busybox_ver=64
+        elif vt_str_begin "$vt_volume_id" "KAOS_"; then
+            set ventoy_busybox_ver=64
 
         fi
     fi
@@ -1481,7 +1434,7 @@ function iso_common_menuentry {
             echo -e "\n $vt_volume_space $vt_chosen_size $vt_chosen_size_mod\n"
             echo -e "\n The size of the iso file \"$vt_chosen_size\" is invalid. File corrupted ?\n"
             echo -e " 此ISO文件的大小 \"$vt_chosen_size\" 有问题，请确认文件是否损坏。\n"
-            echo -e "\n press ENTER to continue (请按 回车 键继续) ..."
+            echo -en "\n$VTLANG_ENTER_CONTINUE ..."
             read vtInputKey
         fi
     fi
@@ -1493,6 +1446,33 @@ function iso_common_menuentry {
     if ventoy_vcfg_proc "${vt_chosen_path}"; then        
         return
     fi
+    
+    
+    
+    #secondary boot menu
+    if vt_is_udf "${vtoy_iso_part}${vt_chosen_path}"; then
+        set ventoy_fs_probe=udf
+    else
+        set ventoy_fs_probe=iso9660
+        ventoy_reset_nojoliet
+    fi
+    
+    if [ -d (loop)/ ]; then
+        loopback -d loop
+    fi
+    loopback loop "${vtoy_iso_part}${vt_chosen_path}" 
+    
+    get_os_type (loop)
+    
+    ventoy_debug_pause
+    
+    if vt_need_secondary_menu "$vt_chosen_name"; then
+        vt_show_secondary_menu "$vt_chosen_path" "$vtoy_os" $vt_chosen_size
+        if [ "$VTOY_SECOND_EXIT" = "1" ]; then
+            return
+        fi
+    fi
+
 
     if vt_str_begin "$vt_volume_id" "Avira"; then 
         vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}"
@@ -1544,7 +1524,9 @@ function iso_common_menuentry {
         else
             uefi_iso_menu_func $vtoy_iso_part  "$vt_chosen_path"
         fi
-    fi      
+    fi
+
+    vt_secondary_recover_mode
 }
 
 function miso_common_menuentry {
@@ -1569,7 +1551,7 @@ function miso_common_menuentry {
 function common_unsupport_menuentry {
     echo -e "\n The name of the iso file could NOT contain space or non-ascii characters. \n"
     echo -e " 文件名中不能有中文或空格 \n"    
-    echo -e "\npress ENTER to exit (请按 回车 键返回) ..."    
+    echo -en "\n$VTLANG_ENTER_EXIT ..."  
     read vtInputKey
 }
 
@@ -1716,7 +1698,7 @@ function vhd_common_menuentry {
                 echo -e "!!! WARNING !!!\n"
                 echo -e "\nPartition1 ($vtoy_iso_fs) is NOT ntfs, the VHD(x) file may not boot normally \n"
                 echo -e "\nVHD(x) 文件所在分区不是 ntfs 格式, 可能无法正常启动 \n\n"
-                echo -n "press ENTER to continue boot (请按 回车 键继续) ..."    
+                echo -en "\n$VTLANG_ENTER_CONTINUE ..."
                 read vtInputKey
             fi
         fi
@@ -1825,7 +1807,7 @@ function vtoy_unsupport_menuentry {
 
 function only_uefi_tip {
     echo -e "\n This IMG file is only supported in UEFI mode. \n"
-    echo -e "\n press ENTER to exit ..."
+    echo -en "\n$VTLANG_ENTER_EXIT ..."
     read vtInputKey 
 }
 
@@ -1917,6 +1899,20 @@ function ventoy_img_openelec {
     loopback vtloopex $vtoy_efi_part/ventoy/vtloopex.cpio    
     vt_img_extra_initrd_append  (vtloopex)/$elec_ver/vtloopex.tar.xz
 
+    if [ "$elec_ver" = "LibreELEC" ]; then
+        if [ -f (vtimghd,1)/system ]; then
+            loopback elecsfs (vtimghd,1)/system
+            vt_get_lib_module_ver (elecsfs) /usr/lib/kernel-overlays/base/lib/modules/  vt_module_ver
+            if [ -n "$vt_module_ver" ]; then        
+                for mod in "kernel/drivers/md/dm-mod.ko"; do
+                    if [ -e (elecsfs)/usr/lib/kernel-overlays/base/lib/modules/$vt_module_ver/$mod ]; then
+                        vt_img_extra_initrd_append  (elecsfs)/usr/lib/kernel-overlays/base/lib/modules/$vt_module_ver/$mod
+                    fi
+                done
+            fi
+        fi
+    fi
+
     ventoy_debug_pause
 
     #boot image file
@@ -1929,6 +1925,7 @@ function ventoy_img_openelec {
     vt_img_unhook_root
     vt_unset_boot_opt
     loopback -d vtloopex
+    loopback -d elecsfs
 }
 
 
@@ -2083,7 +2080,7 @@ function ventoy_img_openwrt {
             ventoy_gui_console
             echo -e "\n ventoy_openwrt.xz not found. Please refer https://www.ventoy.net/en/doc_openwrt.html.\n"
             echo -e " 未找到 ventoy_openwrt.xz 文件。请参考 https://www.ventoy.net/cn/doc_openwrt.html\n"
-            echo -e "\n press ENTER to exit (请按 回车 键返回) ..."
+            echo -en "\n$VTLANG_ENTER_EXIT ..."
             read vtInputKey
             ventoy_cli_console
             return
@@ -2207,6 +2204,23 @@ function ventoy_img_cloudready {
     unset linuxpartB
 }
 
+
+function ventoy_img_fwts {
+    vt_load_cpio  $vtoy_path  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit
+
+    ventoy_debug_pause
+
+    #boot image file
+    vt_set_boot_opt rdinit=/vtoy/vtoy ventoyos=fwts
+    vt_img_hook_root
+    
+    configfile $prefix/distro/fwts.cfg
+
+    vt_img_unhook_root
+    vt_unset_boot_opt
+}
+
 function ventoy_img_memtest86 {      
     chainloader (vtimghd,1)/efi/boot/BOOTX64.efi
     boot
@@ -2215,7 +2229,7 @@ function ventoy_img_memtest86 {
 function img_unsupport_tip {
     echo -e "\n This IMG file is NOT supported now. \n"
     echo -e " 当前不支持启动此 IMG 文件 \n"    
-    echo -e "\npress ENTER to exit (请按 回车 键返回) ..."    
+    echo -en "\n$VTLANG_ENTER_EXIT ..."
     read vtInputKey 
 }
 
@@ -2272,6 +2286,14 @@ function img_common_menuentry {
         vt_get_fs_label (vtimghd,2) vtImgHd2Label
     fi
 
+    if [ -z "$vtImgHd1Label" ]; then
+        if [ -d (vtimghd,2)/efi ]; then
+            vt_get_fs_label (vtimghd,3) vtImgHd3Label
+        elif [ -d (vtimghd,12)/efi ]; then
+            vt_get_fs_label (vtimghd,3) vtImgHd3Label
+        fi
+    fi
+
     if [ -e (vtimghd,1)/etc/hostname ]; then
         vt_1st_line (vtimghd,1)/etc/hostname vtImgHostname
     fi
@@ -2289,6 +2311,8 @@ function img_common_menuentry {
         elif [ -f (vtimghd,3)/etc/chrome_dev.conf ]; then
             ventoy_img_cloudready
         fi
+    elif vt_str_begin "$vtImgHd3Label" "fwts-result"; then
+        ventoy_img_fwts
     elif vt_str_begin "$vtImgHd1Label" "LAKKA"; then
         ventoy_img_openelec lakka
     elif vt_str_begin "$vtImgHd1Label" "LIBREELEC"; then
@@ -2314,14 +2338,15 @@ function img_common_menuentry {
     elif [ -f (vtimghd,2)/loader/entries/ubos.conf ]; then
         ventoy_img_ubos
     elif [ -f (vtimghd,2)/etc/openwrt_version ]; then
-        ventoy_img_openwrt
-    elif [ -f (vtimghd,1)/efi/boot/mt86.png ]; then 
-        if [ "$grub_platform" = "pc" ]; then
-            img_unsupport_tip
-        else
-            ventoy_img_memtest86            
-        fi    
+        ventoy_img_openwrt    
     else
+        if [ -f (vtimghd,1)/efi/boot/mt86.png ]; then 
+            if [ "$grub_platform" = "pc" ]; then
+                img_unsupport_tip
+            fi 
+        fi
+
+        #common chain
         vt_linux_chain_data "${vtoy_iso_part}${vt_chosen_path}"
         ventoy_acpi_param ${vtoy_chain_mem_addr} 512
         if [ "$grub_platform" = "pc" ]; then 
@@ -2346,6 +2371,28 @@ function img_unsupport_menuentry {
     common_unsupport_menuentry
 }
 
+function mimg_common_menuentry {
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
+
+    if vt_check_password "${vt_chosen_path}"; then
+        return
+    fi
+
+    echo "memdisk mode boot for $vt_chosen_path"
+    echo ""
+    ventoy_debug_pause
+
+    if [ "$grub_platform" = "pc" ]; then
+        legacy_img_memdisk $vtoy_iso_part "$vt_chosen_path"
+    else
+        vt_load_img_memdisk "$vtoy_iso_part$vt_chosen_path" vtoy_img_buf
+        ventoy_cli_console
+        chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_img_buf_addr}:size:${vtoy_img_buf_size}
+        boot
+        ventoy_gui_console    
+    fi      
+}
+
 #############################################################
 #############################################################
 #############################################################
@@ -2354,7 +2401,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.84"
+set VENTOY_VERSION="1.1.00"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -2512,7 +2559,20 @@ elif [ "$vtoy_display_mode" = "serial_console" ]; then
     fi
     terminal_input   serial console
     terminal_output  serial console    
-else    
+else
+    if [ "$vtoy_gfxmode" = "max" ]; then
+        set gfxmode=1024x768
+        terminal_output  gfxterm
+
+        vt_enum_video_mode
+        vt_get_video_mode 0 vtCurMode
+        terminal_output console
+        set gfxmode=$vtCurMode
+        terminal_output gfxterm
+    elif [ "$vtoy_res_fit" = "1" ]; then
+        terminal_output  gfxterm
+    fi    
+
     if [ -n "$vtoy_theme" ]; then
         vt_set_theme
     else

INSTALL/grub/help/ar_AR.txt

@@ -0,0 +1,18 @@
+ L - اختيار اللغة
+F1 - عرض معلومات المساعدة
+F2 - استعراض وتشغيل الملفات في القرص المحلي
+F3 - تبديل وضع القائمة بين Treeview <-> ListView
+F4 - تشغيل ويندوز / لينكس على القرص المحلي
+F5 - الأدوات المساعده
+F6 - تحميل قائمة Grub2 المخصصة
+F7 - التبديل بين وضع الواجهة الرسومية <-> وضع النص
+
+m / Ctrl + m - تحقق من صحة الملفات الصور (md5 / sha1 / sha256 / sha512)
+d / Ctrl + d - وضع Memdisk (فقط للصغير WinPE / LiveCD ISO / IMG)
+w / Ctrl + w - وضع WIMBOOT (فقط للويندوز القياسي ISO)
+r / Ctrl + r - وضع Grub2 (يدعم بعض توزيعات لينكس)
+i / Ctrl + i - وضع متوافق (فقط للتدقيق)
+u / Ctrl + u - تحميل برنامج التشغيل EFI ISO (فقط للتدقيق، غير مستخدم رسمي)
+
+
+اضغط على ESC للعودة ......

INSTALL/grub/help/bn_BN.txt

@@ -9,7 +9,7 @@ F7 - GUI মোড <-> TEXT মোডের মধ্যে স্যুইচ
 
 m/Ctrl+m - চেকসাম ইমেজ ফাইল (md5/sha1/sha256/sha512)
 d/Ctrl+d - Memdisk মোড (শুধুমাত্র ছোট WinPE/LiveCD ISO/IMG জন্য)
-w/Ctrl+w - WIMBOOT মোড (শুধুমাত্র standard Windows ISO জন্য)
+w/Ctrl+w - WIMBOOT মোড (শুধুমাত্র Windows/WinPE ISO জন্য)
 r/Ctrl+r - Grub2 মোড (শুধুমাত্র কিছু Linux distro জন্য)
 i/Ctrl+i - Compatible মোড (শুধুমাত্র debug জন্য)
 u/Ctrl+u - ISO efi ড্রাইভার লোড করুন (শুধুমাত্র debug জন্য, সরকারীভাবে ব্যবহার করা যাবে না)

INSTALL/grub/help/cs_CZ.txt

@@ -0,0 +1,19 @@
+ L - Výběr jazyka
+F1 - Zobrazení nápovědy
+F2 - Procházet spouštět soubory na disku
+F3 - Přepínat mezi zobrazením stromu a seznamu
+F4 - Spustit Windows/Linux na disku
+F5 - Nástroje
+F6 - Nahrát vlastní Grub2 nabídku
+F7 - Přepínat mezi grafickým a textovým režimem
+
+m/Ctrl+m - Kontrolní součky obrazů (md5/sha1/sha256/sha512)
+d/Ctrl+d - Memdisk režim (pouze pro malé WinPE/LiveCD ISO/IMG)
+w/Ctrl+w - WIMBOOT režim (pouze pro Windows/WinPE ISO soubory)
+r/Ctrl+r - Grub2 režim (pouze pro některé linuxové distribuce)
+i/Ctrl+i - Režim kompatibility (pouze pro ladění)
+u/Ctrl+u - Nahrát ISO EFI ovladač (pouze pro ladění, oficiálně nejde použít)
+
+
+
+Stiskněte ESC pro návrat ......

INSTALL/grub/help/de_DE.txt

@@ -9,7 +9,7 @@ F7 - Wechseln zwischen Grafik-/Text-Modus
 
 m/Strg+m - Prüfsumme von Abbilddatei prüfen (md5/sha1/sha256/sha512)
 d/Strg+d - Memdisk-Modus (Nur für kleine WinPE/LiveCD ISO/IMG)
-w/Strg+w - WIMBOOT-Modus (Nur für Standard Windows ISO)
+w/Strg+w - WIMBOOT-Modus (Nur für Windows/WinPE ISO)
 r/Strg+r - Grub2-Modus (Nur für einige Linux-Distributionen)
 i/Strg+i - Kompatibilitäts-Modus (Nur für Fehleranalyse)
 u/Strg+u - ISO EFI-Treiber laden (Nur für Fehleranalyse, darf offiziell nicht benutzt werden)

INSTALL/grub/help/el_GR.txt

@@ -0,0 +1,19 @@
+ L - Επιλογή Γλώσσας
+F1 - Εμφάνιση πληροφοριών βοήθειας
+F2 - Περιήγηση και εκκίνηση αρχείων στον τοπικό δίσκο
+F3 - Εναλλαγή λειτουργίας μενού μεταξύ Προβολής Δένδρου <-> Προβολή Λίστας
+F4 - Εκκίνηση Windows/Linux στον τοπικό δίσκο
+F5 - Εργαλεία
+F6 - Φόρτωση προσαρμοσμένου μενού Grub2
+F7 - Εναλλαγή μεταξύ Λειτουργίας GUI <-> Λειτουργίας ΚΕΙΜΕΝΟΥ
+
+m/Ctrl+m - Αρχεία εικόνας Checksum (md5/sha1/sha256/sha512)
+d/Ctrl+d - Λειτουργία Memdisk (Μόνο για μικρά WinPE/LiveCD ISO/IMG)
+w/Ctrl+w - Λειτουργία WIMBOOT (Μόνο για αρχεία ISO Windows/WinPE)
+r/Ctrl+r - Λειτουργία Grub2 (Μόνο για ορισμένες διανομές Linux)
+i/Ctrl+i - Λειτουργία Συμβατότητας (Μόνο για εντοπισμό σφαλμάτων - debugging)
+u/Ctrl+u - Φόρτωση προγράμματος οδήγησης ISO EFI (Μόνο για εντοπισμό σφαλμάτων - debugging, δεν μπορεί να χρησιμοποιηθεί επίσημα)
+
+
+
+Πατήστε ESC για επιστροφή ......

INSTALL/grub/help/en_US.txt

@@ -1,18 +1,18 @@
  L - Language Select
-F1 - Display this help information
-F2 - Browse and boot files in local disk
+F1 - Display help information
+F2 - Browse and boot files in the local disk
 F3 - Switch menu mode between Treeview <-> ListView
-F4 - Boot Windows/Linux in local disk
+F4 - Boot Windows/Linux on the local disk
 F5 - Utilities
 F6 - Load Custom Grub2 Menu
 F7 - Switch between GUI Mode <-> TEXT Mode
 
 m/Ctrl+m - Checksum image files (md5/sha1/sha256/sha512)
 d/Ctrl+d - Memdisk Mode (Only for small WinPE/LiveCD ISO/IMG)
-w/Ctrl+w - WIMBOOT Mode (Only for standard Windows ISO)
+w/Ctrl+w - WIMBOOT Mode (Only for Windows/WinPE ISO files)
 r/Ctrl+r - Grub2 Mode (Only for some Linux distros)
-i/Ctrl+i - Compatible Mode (Just only for debug)
-u/Ctrl+u - Load ISO efi driver (Just only for debug, can not be used officially)
+i/Ctrl+i - Compatible Mode (Only for debugging)
+u/Ctrl+u - Load ISO EFI driver (Only for debugging, cannot be used officially)
 
 
 

INSTALL/grub/help/es_ES.txt

@@ -0,0 +1,19 @@
+ L - Seleccionar lenguaje
+F1 - Mostrar información de ayuda
+F2 - Navegar y arranca archivos en el disco local
+F3 - Cambiar modo de menú entre vista de árbol <-> vista de lista
+F4 - arrancar Windows/Linux en el disco local
+F5 - Utilidades
+F6 - Cargar menú de Grub2 personalizado
+F7 - Cambiar entre modo grafico <-> modo texto
+
+m/Ctrl+m - Suma de comprobación de archivos de imagen (md5/sha1/sha256/sha512)
+d/Ctrl+d - Modo Memdisk (solo para WinPE/LiveCD ISO/IMG pequeños)
+w/Ctrl+w - Modo WIMBOOT (Solo para archivos Windows/WinPE ISO)
+r/Ctrl+r - Modo Grub2 (Solo para algunas distribuciones de Linux)
+i/Ctrl+i - Modo compatible (Solo para depuración)
+u/Ctrl+u - Cargar controlador ISO EFI (Solo para depuración, no se puede usar oficialmente)
+
+
+
+Presiona ESC para regresar ......