.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.96
+      placeholder: 1.0.91
     validations:
       required: true
   - type: dropdown

DMPATCH/dmpatch.c

@@ -53,12 +53,6 @@ typedef struct ko_param
     unsigned long sym_put_size;
     unsigned long kv_major;
     unsigned long ibt;
-    unsigned long kv_minor;
-    unsigned long blkdev_get_addr;
-    unsigned long blkdev_put_addr;
-    unsigned long bdev_open_addr;
-    unsigned long kv_subminor;
-    unsigned long bdev_file_open_addr;
     unsigned long padding[1];
 }ko_param;
 
@@ -85,24 +79,14 @@ static volatile ko_param g_ko_param =
 #define CODE_MATCH2(code, i) \
     (code[i] == 0x0C && code[i + 1] == 0x80 && code[i + 2] == 0x89 && code[i + 3] == 0xC6)
 
-#define PATCH_OP_POS3    4
-#define CODE_MATCH3(code, i) \
-    (code[i] == 0x44 && code[i + 1] == 0x89 && code[i + 2] == 0xe8 && code[i + 3] == 0x0c && code[i + 4] == 0x80)
-
-
-
-
-
 #elif defined(CONFIG_X86_32)
 #define PATCH_OP_POS1    2
 #define CODE_MATCH1(code, i) \
     (code[i] == 0x80 && code[i + 1] == 0xca && code[i + 2] == 0x80 && code[i + 3] == 0xe8)
 
-#define PATCH_OP_POS2    PATCH_OP_POS1
+#define PATCH_OP_POS2    2
-#define CODE_MATCH2      CODE_MATCH1
+#define CODE_MATCH2(code, i) \
-#define PATCH_OP_POS3    PATCH_OP_POS1
+    (code[i] == 0x80 && code[i + 1] == 0xca && code[i + 2] == 0x80 && code[i + 3] == 0xe8)
-#define CODE_MATCH3      CODE_MATCH1
-
 
 #else
 #error "unsupported arch"
@@ -156,31 +140,10 @@ static volatile ko_param g_ko_param =
 
 #define vdebug(fmt, args...) if(kprintf) kprintf(KERN_ERR fmt, ##args)
 
-static unsigned int g_claim_ptr = 0;
 static unsigned char *g_get_patch[MAX_PATCH] = { NULL };
 static unsigned char *g_put_patch[MAX_PATCH] = { NULL };
 
-static int notrace dmpatch_kv_above(unsigned long Major, unsigned long Minor, unsigned long SubMinor)
+static void notrace dmpatch_restore_code(unsigned char *opCode)
-{
-    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;
 
@@ -188,14 +151,7 @@ static void notrace dmpatch_restore_code(int bytes, unsigned char *opCode, unsig
     {
         align = (unsigned long)opCode / g_ko_param.pgsize * g_ko_param.pgsize;
         set_mem_rw(align, 1);
-        if (bytes == 1)
+        *opCode = 0x80;
-        {
-            *opCode = (unsigned char)code;            
-        }
-        else
-        {
-            *(unsigned int *)opCode = code;
-        }
         set_mem_ro(align, 1);        
     }
 }
@@ -217,7 +173,7 @@ static int notrace dmpatch_replace_code
 
     vdebug("patch for %s style[%d] 0x%lx %d\n", desc, style, addr, (int)size);
 
-    for (i = 0; i < (int)size - 8; i++)
+    for (i = 0; i < (int)size - 4; i++)
     {
         if (style == 1)
         {
@@ -227,7 +183,7 @@ static int notrace dmpatch_replace_code
                 cnt++;
             }
         }
-        else if (style == 2)
+        else
         {
             if (CODE_MATCH2(opCode, i) && cnt < MAX_PATCH)
             {
@@ -235,20 +191,8 @@ static int notrace dmpatch_replace_code
                 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);
@@ -269,148 +213,6 @@ static int notrace dmpatch_replace_code
     return 0;
 }
 
-static unsigned long notrace dmpatch_find_call_offset(unsigned long addr, unsigned long size, unsigned long func)
-{
-    unsigned long i = 0;
-    unsigned long dest;
-    unsigned char *opCode = NULL;
-    unsigned char aucOffset[8] = { 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF };
-
-    opCode = (unsigned char *)addr;
-    
-    for (i = 0; i + 4 < size; i++)
-    {
-        if (opCode[i] == 0xE8)
-        {
-            aucOffset[0] = opCode[i + 1];
-            aucOffset[1] = opCode[i + 2];
-            aucOffset[2] = opCode[i + 3];
-            aucOffset[3] = opCode[i + 4];
-
-            dest = addr + i + 5 + *(unsigned long *)aucOffset;
-            if (dest == func)
-            {
-                return i;
-            }
-        }
-    }
-
-    return 0;
-}
-
-static unsigned int notrace dmpatch_patch_claim_ptr(void)
-{
-    unsigned long i = 0;
-    unsigned long t = 0;
-    unsigned long offset1 = 0;
-    unsigned long offset2 = 0;
-    unsigned long align = 0;
-    unsigned char *opCode = NULL;
-
-    opCode = (unsigned char *)g_ko_param.sym_get_addr;
-    for (i = 0; i < 4; i++)
-    {
-        vdebug("%02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n",
-            opCode[i + 0], opCode[i + 1], opCode[i + 2], opCode[i + 3],
-            opCode[i + 4], opCode[i + 5], opCode[i + 6], opCode[i + 7],
-            opCode[i + 8], opCode[i + 9], opCode[i + 10], opCode[i + 11],
-            opCode[i + 12], opCode[i + 13], opCode[i + 14], opCode[i + 15]);
-    }
-
-    if (dmpatch_kv_above(6, 7, 0)) /* >= 6.7 kernel */
-    {
-        vdebug("Get addr: 0x%lx %lu open 0x%lx\n", g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_open_addr);
-        offset1 = dmpatch_find_call_offset(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_open_addr);
-        if (offset1 == 0)
-        {
-            vdebug("call bdev_open_addr Not found\n");
-
-            vdebug("Get addr: 0x%lx %lu file_open 0x%lx\n", g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_file_open_addr);
-            offset1 = dmpatch_find_call_offset(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_file_open_addr);
-            if (offset1 == 0)
-            {            
-                vdebug("call bdev_file_open_addr Not found\n");
-                return 1;
-            }
-        }
-    }
-    else
-    {
-        vdebug("Get addr: 0x%lx %lu 0x%lx\n", g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.blkdev_get_addr);
-        vdebug("Put addr: 0x%lx %lu 0x%lx\n", g_ko_param.sym_put_addr, g_ko_param.sym_put_size, g_ko_param.blkdev_put_addr);        
-
-        offset1 = dmpatch_find_call_offset(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.blkdev_get_addr);
-        offset2 = dmpatch_find_call_offset(g_ko_param.sym_put_addr, g_ko_param.sym_put_size, g_ko_param.blkdev_put_addr);
-        if (offset1 == 0 || offset2 == 0)
-        {
-            vdebug("call blkdev_get or blkdev_put Not found, %lu %lu\n", offset1, offset2);
-            return 1;
-        }
-    }
-
-    
-    vdebug("call addr1:0x%lx  call addr2:0x%lx\n", 
-        g_ko_param.sym_get_addr + offset1, 
-        g_ko_param.sym_put_addr + offset2);
-    
-    opCode = (unsigned char *)g_ko_param.sym_get_addr;
-    for (i = offset1 - 1, t = 0; (i > 0) && (t < 24); i--, t++)
-    {
-        /* rdx */
-        if (opCode[i] == 0x48 && opCode[i + 1] == 0xc7 && opCode[i + 2] == 0xc2)
-        {
-            g_claim_ptr = *(unsigned int *)(opCode + i + 3);
-            g_get_patch[0] = opCode + i + 3;
-            vdebug("claim_ptr(%08X) found at get addr 0x%lx\n", g_claim_ptr, g_ko_param.sym_get_addr + i + 3);
-            break;
-        }
-    }
-
-    if (g_claim_ptr == 0)
-    {
-        vdebug("Claim_ptr not found in get\n");
-        return 1;
-    }
-
-    
-    align = (unsigned long)g_get_patch[0] / g_ko_param.pgsize * g_ko_param.pgsize;
-    set_mem_rw(align, 1);
-    *(unsigned int *)(g_get_patch[0]) = 0;
-    set_mem_ro(align, 1);  
-
-
-    if (offset2 > 0)
-    {        
-        opCode = (unsigned char *)g_ko_param.sym_put_addr;
-        for (i = offset2 - 1, t = 0; (i > 0) && (t < 24); i--, t++)
-        {
-            /* rsi */
-            if (opCode[i] == 0x48 && opCode[i + 1] == 0xc7 && opCode[i + 2] == 0xc6)
-            {
-                if (*(unsigned int *)(opCode + i + 3) == g_claim_ptr)
-                {
-                    vdebug("claim_ptr found at put addr 0x%lx\n", g_ko_param.sym_put_addr + i + 3);
-                    g_put_patch[0] = opCode + i + 3;
-                    break;                
-                }
-            }
-        }    
-
-        if (g_put_patch[0] == 0)
-        {
-            vdebug("Claim_ptr not found in put\n");
-            return 1;
-        }
-        
-        align = (unsigned long)g_put_patch[0] / g_ko_param.pgsize * g_ko_param.pgsize;
-        set_mem_rw(align, 1);
-        *(unsigned int *)(g_put_patch[0]) = 0;
-        set_mem_ro(align, 1);   
-    }
-
-    return 0;
-}
-
 #ifdef VTOY_IBT
 static __always_inline unsigned long long dmpatch_rdmsr(unsigned int msr)
 {
@@ -432,7 +234,7 @@ static __always_inline void dmpatch_wrmsr(unsigned int msr, u32 low, u32 high)
 		     : : "c" (msr), "a"(low), "d" (high) : "memory");
 }
 
-static u64 notrace dmpatch_ibt_save(void)
+static u64 dmpatch_ibt_save(void)
 {
     u64 msr = 0;
     u64 val = 0;
@@ -444,7 +246,7 @@ static u64 notrace dmpatch_ibt_save(void)
     return msr;
 }
 
-static void notrace dmpatch_ibt_restore(u64 save)
+static void dmpatch_ibt_restore(u64 save)
 {
 	u64 msr;
 
@@ -456,86 +258,13 @@ static void notrace dmpatch_ibt_restore(u64 save)
     dmpatch_wrmsr(MSR_IA32_S_CET, (u32)(msr & 0xffffffffULL), (u32)(msr >> 32));
 }
 #else
-static u64 notrace dmpatch_ibt_save(void) { return 0; }
+static u64 dmpatch_ibt_save(void) { return 0; }
-static void notrace dmpatch_ibt_restore(u64 save) { (void)save; }
+static void 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 r = 0;
     int rc = 0;
     u64 msr = 0;
     
@@ -546,8 +275,7 @@ static int notrace dmpatch_init(void)
     
     kprintf = (printk_pf)(g_ko_param.printk_addr); 
 
-    vdebug("dmpatch_init start pagesize=%lu kernel=%lu.%lu.%lu ...\n", 
+    vdebug("dmpatch_init start pagesize=%lu ...\n", g_ko_param.pgsize);
-        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))
     {
@@ -566,24 +294,39 @@ 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;
 
-    rc = dmpatch_process(g_ko_param.kv_major, g_ko_param.kv_minor, g_ko_param.kv_subminor);
+    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 (rc)
+    if (r && g_ko_param.kv_major >= 5)
-    {
-        if (g_ko_param.kv_major >= 5)
-        {
-            rc = dmpatch_process(6, 5, 0);
-            if (rc)
     {
-                rc = dmpatch_process(6, 7, 0);
+        vdebug("new 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)
+    {
+        rc = -EINVAL;
+        goto out;
     }
+    vdebug("patch dm_get_table_device success\n");
+
+    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 = -EINVAL;
+        goto out;
     }
+    vdebug("patch dm_put_table_device success\n");
+
+    vdebug("#####################################\n");
+    vdebug("######## dm patch success ###########\n");
+    vdebug("#####################################\n");
 
     if (g_ko_param.ibt == 0x8888)
     {
         dmpatch_ibt_restore(msr);
     }
 
+out:
+
 	return rc;
 }
 
@@ -597,21 +340,10 @@ static void notrace dmpatch_exit(void)
         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(g_get_patch[i]);
-            dmpatch_restore_code(1, g_put_patch[i], 0x80);
+        dmpatch_restore_code(g_put_patch[i]);
-        }
     }
 
     vdebug("dmpatch_exit success\n");

DMPATCH/readme.txt

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-FTPIP=192.168.44.1
+FTPIP=168.0.0.209
 FTPUSR='a:a'
 
 rm -f dmpatch.c Makefile Makefile_IBT
@@ -27,7 +27,7 @@ mkdir ./aa
 cp -a *.c aa/
 cp -a Makefile aa/
 
-cd /home/panda/linux-source-5.15.0
+cd /home/panda/linux-source-5.13.0
 make modules M=/home/panda/build/aa/
 strip --strip-debug /home/panda/build/aa/dm_patch.ko
 cd -
@@ -43,7 +43,7 @@ mkdir ./aa
 cp -a *.c aa/
 cp -a Makefile_IBT aa/Makefile
 
-cd /home/panda/linux-source-5.15.0
+cd /home/panda/linux-source-5.13.0
 make modules M=/home/panda/build/aa/
 strip --strip-debug /home/panda/build/aa/dm_patch_ibt.ko
 cd -

DOC/BuildVentoyFromSource.txt

@@ -3,7 +3,7 @@
 1. Compile Environment
 ==========================================
     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.
+    Because Ventoy is based on many open source projects, so the environment is important. I suggest you test it on a virtual machine firstly.
 
 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-party source code and tool
+2.2 Download third-part 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
-    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
+    http://ftp.loongnix.cn/toolchain/gcc/release/mips/gcc7/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz ===> /opt/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz    
     https://github.com/ventoy/musl-cross-make/releases/download/latest/output.tar.bz2 ===> /opt/output.tar.bz2
 
 
@@ -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-party tools
+2.3 Prepare third-part tools
     cd /home/Ventoy-master/DOC/
     tar xf musl-1.2.1.tar.gz
     cd musl-1.2.1
@@ -62,21 +62,21 @@
 ==========================================
 3. All in one script
 ==========================================
-    I have made an all-in-one script `all_in_one.sh`. You can run this script to build and pack ventoy.
+    I have made a 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 parts contain binaries and are rarely modified, so will not be recompiled everytime.
+    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.
        You can rebuild these parts separately if you want.
        
-    2. Some parts of Ventoy have a 32-bit and 64-bit version (like 4.9, 4.10, 4.11 follows)
+    2. some part of Ventoy has 32bit&64bit 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.
+       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 rarely modified, so you only need to build once or you can directly use the binaries I have built.
+       Fortunately these parts are few modified, you only need to build once or you can directly use the binary I have built.
 
-    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.
+    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.
 
 ==========================================
 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 32-bit in a 32-bit CentOS system and get mkexfatfs_32 and mount.exfat-fuse_32
+    Use the same build step to build exfat-util 32bit in a 32bit 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 32-bit CentOS system and get vtoy_fuse_iso_32
+    Use the same build step to build in a 32bit 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 32-bit CentOS system and get unsquashfs_32
+    Use the same build step to build in a 32bit CentOS system and get unsquashfs_32
    
 4.12 == Build vblade_64/vblade_32 ==
     cd /home/Ventoy-master/VBLADE/vblade-master

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

@@ -103,7 +103,6 @@ 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)
@@ -124,16 +123,9 @@ 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
@@ -731,11 +723,10 @@ grub_ext2_read_symlink (grub_fshelp_node_t node)
   if (! symlink)
     return 0;
 
-  /*
+  /* If the filesize of the symlink is bigger than
-   * If the filesize of the symlink is equal to or bigger than 60 the symlink
+     60 the symlink is stored in a separate block,
-   * is stored in a separate block, otherwise it is stored in the inode.
+     otherwise it is stored in the inode.  */
-   */
+  if (grub_le_to_cpu32 (diro->inode.size) <= sizeof (diro->inode.symlink))
-  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/ventoy/ventoy_browser.c

@@ -244,15 +244,6 @@ 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) ||

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

@@ -65,7 +65,6 @@ 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;
@@ -1901,15 +1900,10 @@ static int ventoy_collect_img_files(const char *filename, const struct grub_dirh
             return 0;
         }
 
-        if (g_filt_trash_dir)
+        if (filename[0] == '$' && 0 == grub_strncmp(filename, "$RECYCLE.BIN", 12))
-        {
-            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)
         {
@@ -2838,12 +2832,6 @@ 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)
     {

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

@@ -1298,7 +1298,6 @@ 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];

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

@@ -504,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 = NULL;
+    ventoy_gpt_info *gpt;
     
     (void)ctxt;
 

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 c 5 1
+$BUSYBOX_PATH/mknod -m 660 /dev/console b 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/debian/ventoy-hook.sh

@@ -49,8 +49,6 @@ 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/suse/udev_disk_hook.sh

@@ -54,21 +54,6 @@ 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 c 5 1
+    $BUSYBOX_PATH/mknod -m 660 /dev/console b 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,17 +209,8 @@ ventoy_check_dm_module() {
         vtlog "modprobe failed, now try to insmod ko..."
     
         $FIND /lib/modules/ -name "dm-mod.ko*" | while read vtline; do
-            vtlog "insmod $vtline "
+            vtlog "insmode $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
     
@@ -301,7 +292,6 @@ ventoy_need_dm_patch() {
 }
 
 ventoy_dm_patch() {
-    vtDmPatchDebug=0
     vtMType=$($BUSYBOX_PATH/uname -m)
 
     vtlog "######### ventoy_dm_patch ############"
@@ -335,9 +325,8 @@ ventoy_dm_patch() {
     $CAT /proc/kallsyms | $BUSYBOX_PATH/sort > $VTOY_PATH/kallsyms
     
     if $GREP -m1 -q 'open_table_device.isra' $VTOY_PATH/kallsyms; then
-        vtISRA=$($GREP -m1 'open_table_device.isra' $VTOY_PATH/kallsyms | $AWK '{print $3}')
+        vtLine=$($VTOY_PATH/tool/vtoyksym open_table_device.isra $VTOY_PATH/kallsyms)
-        vtLine=$($VTOY_PATH/tool/vtoyksym $vtISRA $VTOY_PATH/kallsyms)
+        vtlog "get open_table_device.isra address $vtLine"
-        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"
@@ -345,23 +334,6 @@ 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"
@@ -378,15 +350,6 @@ 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}')
@@ -401,9 +364,8 @@ 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 bdev_open_addr=$bdev_open_addr bdev_file_open_addr=$bdev_file_open_addr
+    vtlog ro_addr=$ro_addr  rw_addr=$rw_addr  printk_addr=$printk_addr
 
     if [ "$get_addr" = "0" -o "$put_addr" = "0" ]; then
         vtlog "Invalid symbol address"
@@ -416,24 +378,18 @@ 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)
-    elif [ -d /lib/modules/$vtKv/kernel ]; then
+    else
         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/ -name "*.ko*" | $HEAD -n1)
+        vtModPath=$($FIND /lib/modules/$vtKv/kernel/ -name "*.ko*" | $HEAD -n1)
     fi
     
     vtModName=$($BUSYBOX_PATH/basename $vtModPath)
@@ -449,8 +405,6 @@ 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
@@ -459,27 +413,18 @@ ventoy_dm_patch() {
        
     
     #step1: modify vermagic/mod crc/relocation
-    vtlog "$VTOY_PATH/tool/vtoykmod -u $vtKVMajor $vtKVMinor $VTOY_PATH/tool/$vtKoName $VTOY_PATH/$vtModName $vtDebug"
+    vtlog "$VTOY_PATH/tool/vtoykmod -u $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
+    $VTOY_PATH/tool/vtoykmod -u $VTOY_PATH/tool/$vtKoName $VTOY_PATH/$vtModName $vtDebug
     
     #step2: fill parameters
     vtPgsize=$($VTOY_PATH/tool/vtoyksym -p)
+    vtlog "$VTOY_PATH/tool/vtoykmod -f $VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtKv $vtIBT $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 $vtKv $vtIBT $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"
+    $BUSYBOX_PATH/insmod $VTOY_PATH/tool/$vtKoName
-    
-    
-    vtlog "$VTOY_PATH/tool/vtoykmod -f $vtPrams"
-    $VTOY_PATH/tool/vtoykmod -f $vtPrams >>$VTLOG 2>&1
-
-
-    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
     
 }

IMG/cpio/ventoy/init_chain

@@ -112,28 +112,6 @@ 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
@@ -153,23 +131,14 @@ 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
-            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
     done

INSTALL/ExtendPersistentImg.sh

@@ -4,9 +4,8 @@ print_usage() {
     echo 'Usage:  ExtendPersistentImg.sh file size'
     echo '   file   persistent dat file'
     echo '   size   extend size in MB'
-    echo 'Examples:'
+    echo 'Example:'
-    echo '   sh ExtendPersistentImg.sh ubuntu.dat 2048 - This command would extend ubuntu.dat by 2048MB (2GB)'
+    echo '   sh ExtendPersistentImg.sh ubuntu.dat 2048'
-    echo '   sh ExtendPersistentImg.sh ubuntu.dat -2048 - This command reduces ubuntu.dat by 2048MB (-2GB)'
     echo ''
 }
 
@@ -20,11 +19,6 @@ 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/VentoyPlugson.sh

@@ -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/grub/grub.cfg

@@ -1411,8 +1411,6 @@ 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
@@ -2399,7 +2397,7 @@ function mimg_common_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.99"
+set VENTOY_VERSION="1.0.95"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1

INSTALL/grub/help/hu_HU.txt

@@ -1,19 +1,19 @@
  L - Nyelv kiválasztása
-F1 - Súgóinformációk megjelenítése
+F1 - Jelenítse meg ezt a súgóinformációt
-F2 - Helyi lemezen lévő fájlok tallózása és indítása
+F2 - A helyi lemezen lévő fájlok böngészése és indítása
-F3 - Menü mód váltása fanézet <-> listanézet között
+F3 - Menü mód váltása Fanézet <-> Listanézet között
-F4 - Windows/Linux indítása a helyi lemezről
+F4 - Windows/Linux indítása helyi lemezről
 F5 - Segédprogramok
 F6 - Egyéni Grub2 menü betöltése
-F7 - Váltás grafikus mód <-> szöveges mód között
+F7 - Váltás Grafikus mód <-> Szövege mód között
 
-m/Ctrl+m - Lemezképfájlok ellenőrzőösszege (md5/sha1/sha256/sha512)
+m/Ctrl+m - Image fájlok ell.összege (md5/sha1/sha256/sha512)
-d/Ctrl+d - Memórialemez mód (csak kis WinPE/LiveCD ISO/IMG esetén)
+d/Ctrl+d - Memdisk mód (Csak kis WinPE/LiveCD ISO/IMG esetén)
-w/Ctrl+w - WIMBOOT mód (csak Windows/WinPE ISO esetén)
+w/Ctrl+w - WIMBOOT mód (Csak Windows/WinPE ISO esetében)
-r/Ctrl+r - Grub2 mód (csak néhány Linux disztribúció esetén)
+r/Ctrl+r - Grub2 mód (Csak néhány Linux disztró esetében)
-i/Ctrl+i - Kompatibilis mód (csak hibakereséshez)
+i/Ctrl+i - Kompatibilis mód (Csak hibakeresésre)
-u/Ctrl+u - ISO EFI illesztőprogram betöltés (csak hibakereséshez, hivatalosan nem használható)
+u/Ctrl+u - ISO efi driver betöltés (Csak hibakeresésre, hivatalosan nem használható.)
 
 
 
-Nyomja meg az ESC billentyűt a visszalépéshez ......
+Nyomjon ESC-et a visszatéréshez ......

INSTALL/grub/help/it_IT.txt

@@ -1,19 +0,0 @@
- L - Selezione lingua interfaccia
-F1 - Visualizza informazioni Aiuto (questa guida)
-F2 - Sfoglia e avvia file nel disco locale
-F3 - Cambia modalità menu tra VistaStruttura <-> VistaElenco
-F4 - Avvia Windows/Linux dal disco locale
-F5 - Utilità
-F6 - Carica il menu Grub2 personalizzato
-F7 - Cambia modalità GUI <-> modalità TESTO
-
-m/Ctrl+m - Checksum file immagine (md5/sha1/sha256/sha512)
-d/Ctrl+d - Modalità Memdisk (solo per i file ISO/IMG WinPE/LiveCD piccoli)
-w/Ctrl+w - Modalità WIMBOOT (solo per i file ISO Windows/WinPE)
-r/Ctrl+r - Modalità Grub2 (solo per alcune distro Linux)
-i/Ctrl+i - Modalità Compatibile (solo per debugging)
-u/Ctrl+u - Carica driver EFI ISO (solo per debugging, non usato ufficialmente)
-
-
-
-Premi 'ESC' per continuare...

INSTALL/grub/help/tr_TR.txt

@@ -1,19 +1,19 @@
  L - Dil Seçimi
 F1 - Yardım bilgilerini göster
-F2 - Yerel diskteki önyükleme dosyalarına göz at ve önyükleme yap
+F2 - Yerel diskteki önyükleme dosyalarına GÖZAT ve Önyükleme yap
 F3 - Menü modunu Ağaç Görünümü <-> Liste Görünümü arasında değiştir
 F4 - Windows & Linux'u yerel diskten önyükle
-F5 - Ventoy araçlar menüsü
+F5 - Ventoy Araçlar menüsü
 F6 - Özelleştirilmiş Grub2 menüsünü yükle
 F7 - Grafik(GUI) <--> Metin(Text) modları arasında geçiş yap
 
-m/Ctrl+m - Görüntü dosyalarının sağlama toplamını al (md5/sha1/sha256/sha512)
+m/Ctrl+m - Görüntü dosyalarını sağlama toplamı (md5/sha1/sha256/sha512)
-d/Ctrl+d - Memdisk Modunu başlat(Yalnızca küçük WinPE/LiveCD ISO/IMG'ler için)
+d/Ctrl+d - Memdisk Modu başlat(Yalnızca küçük WinPE/LiveCD ISO/IMG ler için)
-w/Ctrl+w - WIMBOOT Modunu başlat(Yalnızca normal Windows/WinPE ISO'ları için)
+w/Ctrl+w - WIMBOOT Modu başlat(Yalnızca normal Windows/WinPE ISO ları için)
-r/Ctrl+r - Grub2 Modunu başlat (Yalnızca bazı Linux dağıtımları için)
+r/Ctrl+r - Grub2 Modu başlat (Yalnızca bazı Linux dağıtımları için)
 i/Ctrl+i - Uyumluluk Modu (Yalnızca hata ayıklama için )
-u/Ctrl+u - ISO EFI sürücüsünü yükle (Sadece hata ayıklama için, resmi olarak kullanılamaz)
+u/Ctrl+u - ISO efi sürücüsünü yükle (Saedece hata ayıklama için, resmi olarak kullanılamaz)
 
 
 
-Geri dönmek için ESC tuşuna basınız ......
+Geriye dönmek için ESC tuşuna basınız......

INSTALL/grub/help/vi_VN.txt

@@ -1,19 +0,0 @@
- L - Lựa chọn ngôn ngữ
-F1 - Hiển thị thông tin trợ giúp
-F2 - Duyệt tìm và khởi động tệp từ ổ đĩa trên máy
-F3 - Chuyển đổi chế độ bảng chọn giữa dạng cây <-> dạng danh sách.
-F4 - Khởi động Windows hoặc GNU/Linux trên đĩa cục bộ
-F5 - Các tiện ích 
-F6 - Tải menu GRUB2 tuỳ chọn
-F7 - Chuyển giữa giao diện đồ hoạ <-> giao diện văn bản
-
-m/Ctrl+m - Checksum các tệp ảnh đĩa (md5/sha1/sha256/sha512)
-d/Ctrl+d - Chế độ Memdisk (Chỉ dùng cho các tệp ISO/IMG WinPE/LiveCD có kích thước nhỏ)
-w/Ctrl+w - Chế độ WIMBOOT (Chỉ dùng cho các tệp ISO Windows/WinPE)
-r/Ctrl+r - Chế độ Grub2 (Chỉ dùng cho một vài bản phân phối của GNU/Linux)
-i/Ctrl+i - Chế độ tương thích (Chỉ dùng cho việc sửa lỗi)
-u/Ctrl+u - Tải ISO của một driver EFI (Chỉ dùng cho việc sửa lỗi, không thể dùng chính thức)
-
-
-
-Nhấn ESC để quay lại ......

INSTALL/grub/menu/ar_AR.json

@@ -1,14 +1,12 @@
 {
     "VTLANG_LANGUAGE_NAME": "Arabic (العربية)",
     
-    "VTLANG_STR_HOTKEY_LIST": "L: لغة F1: مساعدة F2: تصفح F3: عرض لائحي F4: إقلاع محلي F5: أدوات F6: عوده",
+    "VTLANG_STR_HOTKEY_LIST": "L: لغه F1: مساعدة F2: تصفح F3: عرض قائمه F4: اقلا محلي F5: أدوات F6: عوده",
-    "VTLANG_STR_HOTKEY_TREE": "L: لغة F1: مساعدة F2: تصفح F3: عرض شجري F4: إقلاع محلي F5: أدوات F6: عوده",
+    "VTLANG_STR_HOTKEY_TREE": "L: لغه F1: مساعدة F2: تصفح F3: عرض تصنيف F4: اقلاع محلي F5: أدوات F6: عوده",
     "VTLANG_RETURN_PREVIOUS": "عودة إلى القائمة السابقة [Esc]",
     "VTLANG_RETURN_PRV_NOESC": "عودة إلى القائمة السابقة",
-    
     "VTLANG_MENU_LANG": "اختيار اللغة في القائمة",
-    
+    "VTLANG_LB_SBOOT_WINDOWS": "البحث والإقلاع على ويندوز",
-    "VTLANG_LB_SBOOT_WINDOWS": "البحث والإقلاع على Windows",
     "VTLANG_LB_SBOOT_G4D": "البحث والإقلاع على Grub4dos",
     "VTLANG_LB_SBOOT_HDD1": "الإقلاع على القرص المحلي الأول",
     "VTLANG_LB_SBOOT_HDD2": "الإقلاع على القرص المحلي الثاني",
@@ -17,39 +15,32 @@
     "VTLANG_LB_SBOOT_IA32EFI": "البحث والإقلاع على BOOTIA32.EFI",
     "VTLANG_LB_SBOOT_AA64EFI": "البحث والإقلاع على BOOTAA64.EFI",
     "VTLANG_LB_SBOOT_XORBOOT": "البحث والإقلاع على xorboot",
-    
+    "VTLANG_FILE_CHKSUM": "مجموعة التحقق من الملفات",
-    "VTLANG_FILE_CHKSUM": "تدقيق المجموع للملف",
+    "VTLANG_CHKSUM_MD5_CALC": "حساب md5sum",
-    "VTLANG_CHKSUM_MD5_CALC": "احسب md5sum",
+    "VTLANG_CHKSUM_SHA1_CALC": "حساب sha1sum",
-    "VTLANG_CHKSUM_SHA1_CALC": "احسب sha1sum",
+    "VTLANG_CHKSUM_SHA256_CALC": "حساب sha256sum",
-    "VTLANG_CHKSUM_SHA256_CALC": "احسب sha256sum",
+    "VTLANG_CHKSUM_SHA512_CALC": "حساب sha512sum",
-    "VTLANG_CHKSUM_SHA512_CALC": "احسب sha512sum",
+    "VTLANG_CHKSUM_MD5_CALC_CHK": "حساب وتحقق md5sum",
-    "VTLANG_CHKSUM_MD5_CALC_CHK": "احسب وتحقق md5sum",
+    "VTLANG_CHKSUM_SHA1_CALC_CHK": "حساب وتحقق sha1sum",
-    "VTLANG_CHKSUM_SHA1_CALC_CHK": "احسب وتحقق sha1sum",
+    "VTLANG_CHKSUM_SHA256_CALC_CHK": "حساب وتحقق sha256sum",
-    "VTLANG_CHKSUM_SHA256_CALC_CHK": "احسب وتحقق sha256sum",
+    "VTLANG_CHKSUM_SHA512_CALC_CHK": "حساب وتحقق sha512sum",
-    "VTLANG_CHKSUM_SHA512_CALC_CHK": "احسب وتحقق sha512sum",
-    
     "VTLANG_POWER": "الطاقة",
     "VTLANG_POWER_REBOOT": "إعادة التشغيل",
     "VTLANG_POWER_HALT": "إيقاف",
     "VTLANG_POWER_BOOT_EFIFW": "إعادة التشغيل إلى إعداد EFI",
-    
     "VTLANG_KEYBRD_LAYOUT": "تخطيطات لوحة المفاتيح",
-    "VTLANG_HWINFO": "معلومات حول العتاد",
+    "VTLANG_HWINFO": "معلومات الأجهزة الأساسية",
-    
     "VTLANG_RESOLUTION_CFG": "تكوين الدقة",
     "VTLANG_SCREEN_MODE": "وضع عرض الشاشة",
-    "VTLANG_SCREEN_TEXT_MODE": "فرض تحديد وضع النص",
+    "VTLANG_SCREEN_TEXT_MODE": "القيام بتحديد وضع النص",
-    "VTLANG_SCREEN_GUI_MODE": "فرض تحديد وضع الرسومات",
+    "VTLANG_SCREEN_GUI_MODE": "القيام بتحديد وضع الرسومات",
-    
+    "VTLANG_THEME_SELECT": "اختيار الموضوع",
-    "VTLANG_THEME_SELECT": "اختر السمة",
+    "VTLANG_UEFI_UTIL": "Ventoy UEFI Utilities",
-    
-    "VTLANG_UEFI_UTIL": "أدوات Ventoy UEFI المساعدة",
     "VTLANG_UTIL_SHOW_EFI_DRV": "عرض برامج تشغيل EFI",
     "VTLANG_UTIL_FIX_BLINIT_FAIL": "إصلاح فشل تهيئة Windows BlinitializeLibrary",
-    
     "VTLANG_JSON_CHK_JSON": "التحقق من تكوين json للبرنامج الإضافي (ventoy.json)",
     "VTLANG_JSON_CHK_CONTROL": "التحقق من تكوين برنامج الإضافي العام للتحكم",
-    "VTLANG_JSON_CHK_THEME": "التحقق من تكوين برنامج الإضافي الخاص بالسمة",
+    "VTLANG_JSON_CHK_THEME": "التحقق من تكوين برنامج الإضافي الخاص بالموضوع",
     "VTLANG_JSON_CHK_AUTOINS": "التحقق من تكوين برنامج الإضافي للتثبيت التلقائي",
     "VTLANG_JSON_CHK_PERSIST": "التحقق من تكوين برنامج الإضافي المستمر",
     "VTLANG_JSON_CHK_MENU_ALIAS": "التحقق من تكوين برنامج الإضافي الخاص بالقائمة المستعارة",
@@ -62,32 +53,27 @@
     "VTLANG_JSON_CHK_CONF_REPLACE": "التحقق من تكوين برنامج الإضافي الخاص باستبدال ملف التكوين للإقلاع",
     "VTLANG_JSON_CHK_DUD": "التحقق من تكوين برنامج الإضافي الخاص بـ dud",
     "VTLANG_JSON_CHK_PASSWORD": "التحقق من تكوين برنامج الإضافي الخاص بكلمة المرور",
-    
     "VTLANG_NORMAL_MODE": "الإقلاع في الوضع العادي",
     "VTLANG_WIMBOOT_MODE": "الإقلاع في وضع wimboot",
     "VTLANG_GRUB2_MODE": "الإقلاع في وضع grub2",
     "VTLANG_MEMDISK_MODE": "الإقلاع في وضع memdisk",
-    
     "VTLANG_RET_TO_LISTVIEW": "العودة إلى ListView",
     "VTLANG_RET_TO_TREEVIEW": "العودة إلى TreeView",
-    
     "VTLANG_NO_AUTOINS_SCRIPT": "الإقلاع بدون قالب التثبيت التلقائي",
     "VTLANG_AUTOINS_USE": "الإقلاع مع",
-    
     "VTLANG_NO_PERSIST": "الإقلاع بدون الاستمرارية",
     "VTLANG_PERSIST_USE": "الإقلاع مع",
-    
     "VTLANG_BROWER_RETURN": "العودة",
     
     "VTLANG_ENTER_EXIT": "اضغط على مفتاح Enter للخروج",
     "VTLANG_ENTER_REBOOT": "اضغط على مفتاح Enter لإعادة التشغيل",
     "VTLANG_ENTER_CONTINUE": "اضغط على مفتاح Enter للمتابعة",
     
-    "VTLANG_CTRL_TEMP_SET": "إعدادات التحكم المؤقتة",
+    "VTLANG_CTRL_TEMP_SET": "Temporary Control Settings",
-    "VTLANG_WIN11_BYPASS_CHECK": "تجاوز فحص CPU/TPM/SecureBoot عند تثبيت Windows 11",
+    "VTLANG_WIN11_BYPASS_CHECK": "Bypass CPU/TPM/SecureBoot check when install Windows 11",
-    "VTLANG_WIN11_BYPASS_NRO": "تجاوز متطلبات الحساب عبر الإنترنت عند تثبيت Windows 11",
+    "VTLANG_WIN11_BYPASS_NRO": "Bypass online account requirement when install Windows 11",
-    "VTLANG_LINUX_REMOUNT": "ضم قسم Ventoy بعد إقلاع Linux",
+    "VTLANG_LINUX_REMOUNT": "Mount Ventoy partition after boot Linux",
-    "VTLANG_SECONDARY_BOOT_MENU": "اظهر قائمة الإقلاع الثانوية",
+    "VTLANG_SECONDARY_BOOT_MENU": "Show secondary boot menu",
     
     "MENU_STR_XXX": ""
 }

INSTALL/grub/menu/fr_FR.json

@@ -47,7 +47,7 @@
     "VTLANG_UTIL_SHOW_EFI_DRV": "Afficher les pilotes EFI",
     "VTLANG_UTIL_FIX_BLINIT_FAIL": "Contourner l’échec de Windows BlinitializeLibrary",
     
-    "VTLANG_JSON_CHK_JSON": "Afficher le fichier de configuration (ventoy.json)",
+    "VTLANG_JSON_CHK_JSON": "Afficher le fichiers de configuration (ventoy.json)",
     "VTLANG_JSON_CHK_CONTROL": "Afficher la configuration du plugin de contrôle global",
     "VTLANG_JSON_CHK_THEME": "Afficher la configuration du plugin de thème",
     "VTLANG_JSON_CHK_AUTOINS": "Afficher la configuration du plugin d’installation automatique",

INSTALL/grub/menu/hu_HU.json

@@ -1,93 +1,93 @@
 {
-    "VTLANG_LANGUAGE_NAME": "Magyar (Hungarian)",
+    "VTLANG_LANGUAGE_NAME": "Hungarian (Magyar)",
     
-    "VTLANG_STR_HOTKEY_LIST": "L:Nyelv  F1:Súgó  F2:Tallózás  F3:Listanézet  F4:Helyi indítás  F5:Eszközök  F6:Bővített menü",
+    "VTLANG_STR_HOTKEY_LIST": "L:Nyelv  F1:Súgó  F2:Tallóz  F3:Listanézet  F4:Helyi indítás  F5:Eszközök  F6:Bővített menü",
-    "VTLANG_STR_HOTKEY_TREE": "L:Nyelv  F1:Súgó  F2:Tallózás  F3:Fanézet  F4:Helyi indítás  F5:Eszközök  F6:Bővített menü",
+    "VTLANG_STR_HOTKEY_TREE": "L:Nyelv  F1:Súgó  F2:Tallóz  F3:Fanézet  F4:Helyi indítás  F5:Eszközök  F6:Bővített menü",
     "VTLANG_RETURN_PREVIOUS": "Vissza az előző menübe [Esc]",
     "VTLANG_RETURN_PRV_NOESC": "Vissza az előző menübe",
     
-    "VTLANG_MENU_LANG": "Menü nyelvének kiválasztása",
+    "VTLANG_MENU_LANG": "Menü nyelv kiválasztás",
     
-    "VTLANG_LB_SBOOT_WINDOWS": "Windows keresése és indítása",
+    "VTLANG_LB_SBOOT_WINDOWS": "Keresés és indítás - Windows",
-    "VTLANG_LB_SBOOT_G4D": "Grub4dos keresése és indítása",
+    "VTLANG_LB_SBOOT_G4D": "Keresés és indítás - Grub4dos",
     "VTLANG_LB_SBOOT_HDD1": "Indítás az 1. helyi lemezről",
-    "VTLANG_LB_SBOOT_HDD2": "Indítás a 2. helyi lemezről",
+    "VTLANG_LB_SBOOT_HDD2": "Indítás az 2. helyi lemezről",
-    "VTLANG_LB_SBOOT_HDD3": "Indítás a 3. helyi lemezről",
+    "VTLANG_LB_SBOOT_HDD3": "Indítás az 3. helyi lemezről",
-    "VTLANG_LB_SBOOT_X64EFI": "BOOTX64.EFI keresése és indítása",
+    "VTLANG_LB_SBOOT_X64EFI": "Keresés és indítás - BOOTX64.EFI",
-    "VTLANG_LB_SBOOT_IA32EFI": "BOOTIA32.EFI keresése és indítása",
+    "VTLANG_LB_SBOOT_IA32EFI": "Keresés és indítás - BOOTIA32.EFI",
-    "VTLANG_LB_SBOOT_AA64EFI": "BOOTAA64.EFI keresése és indítása",
+    "VTLANG_LB_SBOOT_AA64EFI": "Keresés és indítás - BOOTAA64.EFI",
-    "VTLANG_LB_SBOOT_XORBOOT": "xorboot keresése és indítása",
+    "VTLANG_LB_SBOOT_XORBOOT": "Keresés és indítás - xorboot",
-    
+    
-    "VTLANG_FILE_CHKSUM": "Fájl ellenőrzőösszege",
+    "VTLANG_FILE_CHKSUM": "Fájl ell.összeg",
-    "VTLANG_CHKSUM_MD5_CALC": "md5sum kiszámítása",
+    "VTLANG_CHKSUM_MD5_CALC": "Számítás - md5sum",
-    "VTLANG_CHKSUM_SHA1_CALC": "sha1sum kiszámítása",
+    "VTLANG_CHKSUM_SHA1_CALC": "Számítás - sha1sum",
-    "VTLANG_CHKSUM_SHA256_CALC": "sha256sum kiszámítása",
+    "VTLANG_CHKSUM_SHA256_CALC": "Számítás - sha256sum",
-    "VTLANG_CHKSUM_SHA512_CALC": "sha512sum kiszámítása",
+    "VTLANG_CHKSUM_SHA512_CALC": "Számítás - sha512sum",
-    "VTLANG_CHKSUM_MD5_CALC_CHK": "md5sum kiszámítása és ellenőrzése",
+    "VTLANG_CHKSUM_MD5_CALC_CHK": "Számítás és ellenőrzés - md5sum",
-    "VTLANG_CHKSUM_SHA1_CALC_CHK": "sha1sum kiszámítása és ellenőrzése",
+    "VTLANG_CHKSUM_SHA1_CALC_CHK": "Számítás és ellenőrzés - sha1sum",
-    "VTLANG_CHKSUM_SHA256_CALC_CHK": "sha256sum kiszámítása és ellenőrzése",
+    "VTLANG_CHKSUM_SHA256_CALC_CHK": "Számítás és ellenőrzés - sha256sum",
-    "VTLANG_CHKSUM_SHA512_CALC_CHK": "sha512sum kiszámítása és ellenőrzése",
+    "VTLANG_CHKSUM_SHA512_CALC_CHK": "Számítás és ellenőrzés - sha512sum",
-    
+    
-    "VTLANG_POWER": "Főkapcsoló",
+    "VTLANG_POWER": "Energia",
     "VTLANG_POWER_REBOOT": "Újraindítás",
     "VTLANG_POWER_HALT": "Leállítás",
-    "VTLANG_POWER_BOOT_EFIFW": "Újraindítás EFI beállításba",
+    "VTLANG_POWER_BOOT_EFIFW": "Újraindítás - EFI setup",
     
-    "VTLANG_KEYBRD_LAYOUT": "Billentyűzetkiosztások",
+    "VTLANG_KEYBRD_LAYOUT": "Billentyű kiosztások",
-    "VTLANG_HWINFO": "Hardverinformációk",
+    "VTLANG_HWINFO": "Hardver információ",
     
-    "VTLANG_RESOLUTION_CFG": "Felbontás beállítása",
+    "VTLANG_RESOLUTION_CFG": "Felbontás konfigurációja",
-    "VTLANG_SCREEN_MODE": "Képernyő megjelenítési módja",
+    "VTLANG_SCREEN_MODE": "Képernyő megjelenítési mód",
-    "VTLANG_SCREEN_TEXT_MODE": "Szöveges mód kényszerítése",
+    "VTLANG_SCREEN_TEXT_MODE": "Kénysz. szöveges mód",
-    "VTLANG_SCREEN_GUI_MODE": "Grafikus mód kényszerítése",
+    "VTLANG_SCREEN_GUI_MODE": "Kénysz. grafikus mód",
     
     "VTLANG_THEME_SELECT": "Téma kiválasztása",
     
-    "VTLANG_UEFI_UTIL": "Ventoy UEFI-segédprogramok",
+    "VTLANG_UEFI_UTIL": "Ventoy UEFI Utilities",
-    "VTLANG_UTIL_SHOW_EFI_DRV": "EFI-illesztőprogramok megjelenítése",
+    "VTLANG_UTIL_SHOW_EFI_DRV": "EFI driverek megjelenítése",
     "VTLANG_UTIL_FIX_BLINIT_FAIL": "A Windows BlinitializeLibrary hibájának javítása",
     
-    "VTLANG_JSON_CHK_JSON": "A bővítmény JSON-beállításának (ventoy.json) ellenőrzése",
+    "VTLANG_JSON_CHK_JSON": "Ellenőrizze a plugin json konfigurációt (ventoy.json)",
-    "VTLANG_JSON_CHK_CONTROL": "A globális vezérlőbővítmény beállításának ellenőrzése",
+    "VTLANG_JSON_CHK_CONTROL": "Ellenőrizze a globális vezérlő plugin konfigurációt",
-    "VTLANG_JSON_CHK_THEME": "A téma bővítmény beállításnak ellenőrzése",
+    "VTLANG_JSON_CHK_THEME": "Ellenőrizze a téma plugin konfigurációt",
-    "VTLANG_JSON_CHK_AUTOINS": "Az automatikus telepítés bővítmény beállításának ellenőrzése",
+    "VTLANG_JSON_CHK_AUTOINS": "Ellenőrizze az auto. telepítő plugin konfigurációt",
-    "VTLANG_JSON_CHK_PERSIST": "Az állandóság bővítmény beállításának ellenőrzése",
+    "VTLANG_JSON_CHK_PERSIST": "A persistence plugin konfigurációjának ellenőrzése",
-    "VTLANG_JSON_CHK_MENU_ALIAS": "A menüálnév bővítmény beállításának ellenőrzése",
+    "VTLANG_JSON_CHK_MENU_ALIAS": "Ellenőrizze a menü alias plugin konfigurációt",
-    "VTLANG_JSON_CHK_MENU_TIP": "A menütipp bővítmény beállításának ellenőrzése",
+    "VTLANG_JSON_CHK_MENU_TIP": "Ellenőrizze a menü tipp plugin konfigurációt",
-    "VTLANG_JSON_CHK_MENU_CLASS": "A menüosztály bővítmény beállításának ellenőrzése",
+    "VTLANG_JSON_CHK_MENU_CLASS": "Ellenőrizze a menü osztály plugin konfigurációt",
-    "VTLANG_JSON_CHK_INJECTION": "A befecskendezés bővítmény beállításnak ellenőrzése",
+    "VTLANG_JSON_CHK_INJECTION": "Injekciós plugin konfiguráció ellenőrzése",
-    "VTLANG_JSON_CHK_AUTO_MEMDISK": "Az automatikus memórialemez bővítmény beállításának ellenőrzése",
+    "VTLANG_JSON_CHK_AUTO_MEMDISK": "Auto. memdisk plugin konfiguráció ellenőrzése",
-    "VTLANG_JSON_CHK_IMG_LIST": "A lemezképlista bővítmény beállításnak ellenőrzése",
+    "VTLANG_JSON_CHK_IMG_LIST": "Ellenőrizze a képlista plugin beállításait",
-    "VTLANG_JSON_CHK_IMG_BLIST": "A lemezkép-tiltólista bővítmény beállításnak ellenőrzése",
+    "VTLANG_JSON_CHK_IMG_BLIST": "Ellenőrizze a kép feketelista plugin konfigurációt",
-    "VTLANG_JSON_CHK_CONF_REPLACE": "Az indítási beállítás csere bővítmény beállításnak ellenőrzése",
+    "VTLANG_JSON_CHK_CONF_REPLACE": "Check boot conf cserélje ki a plugin konfigurációt",
-    "VTLANG_JSON_CHK_DUD": "A dud bővítmény beállításnak ellenőrzése",
+    "VTLANG_JSON_CHK_DUD": "Ellenőrizze a dud plugin konfigurációt",
-    "VTLANG_JSON_CHK_PASSWORD": "A jelszó bővítmény beállításnak ellenőrzése",
+    "VTLANG_JSON_CHK_PASSWORD": "Ellenőrizze a jelszó plugin konfigurációját",
     
     "VTLANG_NORMAL_MODE": "Indítás normál módban",
     "VTLANG_WIMBOOT_MODE": "Indítás wimboot módban",
     "VTLANG_GRUB2_MODE": "Indítás grub2 módban",
-    "VTLANG_MEMDISK_MODE": "Indítás memórialemez módban",
+    "VTLANG_MEMDISK_MODE": "Indítás memdisk módban",
     
-    "VTLANG_RET_TO_LISTVIEW": "Vissza a listanézethez",
+    "VTLANG_RET_TO_LISTVIEW": "Vissza a Listanézethez",
-    "VTLANG_RET_TO_TREEVIEW": "Vissza a fanézethez",
+    "VTLANG_RET_TO_TREEVIEW": "Vissza a Fanézethez",
     
-    "VTLANG_NO_AUTOINS_SCRIPT": "Indítás automatikus telepítési sablon nélkül",
+    "VTLANG_NO_AUTOINS_SCRIPT": "Indítás auto. telepítési sablon nélkül",
-    "VTLANG_AUTOINS_USE": "Indítás ezzel:",
+    "VTLANG_AUTOINS_USE": "Indítás ezzel",
     
-    "VTLANG_NO_PERSIST": "Indítás állandóság nélkül",
+    "VTLANG_NO_PERSIST": "Indítás perzisztencia nélkül",
-    "VTLANG_PERSIST_USE": "Indítás ezzel:",
+    "VTLANG_PERSIST_USE": "Indítás ezzel",
     
     "VTLANG_BROWER_RETURN": "Vissza",
     
     "VTLANG_ENTER_EXIT": "nyomja meg az Enter billentyűt a kilépéshez",
     "VTLANG_ENTER_REBOOT": "nyomja meg az Enter billentyűt az újraindításhoz",
-    "VTLANG_ENTER_CONTINUE": "nyomja meg az Enter billentyűt a folytatáshoz",
+    "VTLANG_ENTER_CONTINUE": "a folytatáshoz nyomja meg az Enter billentyűt",
     
-    "VTLANG_CTRL_TEMP_SET": "Ideiglenes vezérlési beállítások",
+    "VTLANG_CTRL_TEMP_SET": "Temporary Control Settings",
-    "VTLANG_WIN11_BYPASS_CHECK": "CPU/TPM/SecureBoot ellenőrzés megkerülése Windows 11 telepítésekor",
+    "VTLANG_WIN11_BYPASS_CHECK": "Bypass CPU/TPM/SecureBoot check when install Windows 11",
-    "VTLANG_WIN11_BYPASS_NRO": "Internetes fiók követelményének megkerülése Windows 11 telepítésekor",
+    "VTLANG_WIN11_BYPASS_NRO": "Bypass online account requirement when install Windows 11",
-    "VTLANG_LINUX_REMOUNT": "Ventoy partíció csatolása a Linux indítása után",
+    "VTLANG_LINUX_REMOUNT": "Mount Ventoy partition after boot Linux",
-    "VTLANG_SECONDARY_BOOT_MENU": "Másodlagos indítási menü megjelenítése",
+    "VTLANG_SECONDARY_BOOT_MENU": "Show secondary boot menu",
     
     "MENU_STR_XXX": ""
 }

INSTALL/grub/menu/it_IT.json

@@ -1,93 +0,0 @@
-{
-    "VTLANG_LANGUAGE_NAME": "Italiano (Italian)",
-    
-    "VTLANG_STR_HOTKEY_LIST": "L:Lingua  F1:Aiuto  F2:Sfoglia  F3:VistaElenco  F4:BootLocale  F5:Strumenti  F6:MenuEx",
-    "VTLANG_STR_HOTKEY_TREE": "L:Lingua  F1:Aiuto  F2:Sfoglia  F3:VistaStruttura  F4:BootLocale  F5:Strumenti  F6:MenuEx",
-    "VTLANG_RETURN_PREVIOUS": "Torna al menu precedente [Esc]",
-    "VTLANG_RETURN_PRV_NOESC": "Torna al menu precedente",
-    
-    "VTLANG_MENU_LANG": "Selezione lingua interfaccia",
-    
-    "VTLANG_LB_SBOOT_WINDOWS": "Cerca e avvia Windows",
-    "VTLANG_LB_SBOOT_G4D": "Cerca e avvia Grub4dos",
-    "VTLANG_LB_SBOOT_HDD1": "Avvia il 1° disco locale",
-    "VTLANG_LB_SBOOT_HDD2": "Avvia il 2° disco locale",
-    "VTLANG_LB_SBOOT_HDD3": "Avvia il 3° disco locale",
-    "VTLANG_LB_SBOOT_X64EFI": "Cerca e avvia BOOTX64.EFI",
-    "VTLANG_LB_SBOOT_IA32EFI": "Cerca e avvia BOOTIA32.EFI",
-    "VTLANG_LB_SBOOT_AA64EFI": "Cerca e avvia BOOTAA64.EFI",
-    "VTLANG_LB_SBOOT_XORBOOT": "Cerca e avvia xorboot",
-    
-    "VTLANG_FILE_CHKSUM": "File checksum",
-    "VTLANG_CHKSUM_MD5_CALC": "Calcola md5sum",
-    "VTLANG_CHKSUM_SHA1_CALC": "Calcola sha1sum",
-    "VTLANG_CHKSUM_SHA256_CALC": "Calcola sha256sum",
-    "VTLANG_CHKSUM_SHA512_CALC": "Calcola sha512sum",
-    "VTLANG_CHKSUM_MD5_CALC_CHK": "Calcola e controlla md5sum",
-    "VTLANG_CHKSUM_SHA1_CALC_CHK": "Calcola e controlla sha1sum",
-    "VTLANG_CHKSUM_SHA256_CALC_CHK": "Calcola e controlla sha256sum",
-    "VTLANG_CHKSUM_SHA512_CALC_CHK": "Calcola e controlla sha512sum",
-    
-    "VTLANG_POWER": "Spegni il computer",
-    "VTLANG_POWER_REBOOT": "Riavvia il computer",
-    "VTLANG_POWER_HALT": "Arresta il computer",
-    "VTLANG_POWER_BOOT_EFIFW": "Riavvia il computer nell'impostazione EFI",
-    
-    "VTLANG_KEYBRD_LAYOUT": "Layout tastiera",
-    "VTLANG_HWINFO": "Informazioni hardware computer",
-    
-    "VTLANG_RESOLUTION_CFG": "Imposta risoluzione schermo",
-    "VTLANG_SCREEN_MODE": "Modalità schermo (testo/grafica)",
-    "VTLANG_SCREEN_TEXT_MODE": "Forza modalità testo schermo",
-    "VTLANG_SCREEN_GUI_MODE": "Forza modalità grafica schermo",
-    
-    "VTLANG_THEME_SELECT": "Seleziona tema interfaccia",
-    
-    "VTLANG_UEFI_UTIL": "Utilità UEFI Ventoy",
-    "VTLANG_UTIL_SHOW_EFI_DRV": "Visualizza driver EFI",
-    "VTLANG_UTIL_FIX_BLINIT_FAIL": "Correzione fallimento BlinitializeLibrary di Windows",
-    
-    "VTLANG_JSON_CHK_JSON": "Modifica file .json plugin (ventoy.json)",
-    "VTLANG_JSON_CHK_CONTROL": "Modifica controllo globale della configurazione dei plugin",
-    "VTLANG_JSON_CHK_THEME": "Modifica tema configurazione dei plugin",
-    "VTLANG_JSON_CHK_AUTOINS": "Modifica installazione automatica della configurazione dei plugin",
-    "VTLANG_JSON_CHK_PERSIST": "Modifica persistenza della configurazione dei plugin",
-    "VTLANG_JSON_CHK_MENU_ALIAS": "Modifica l'alias del menu della configurazione dei plugin",
-    "VTLANG_JSON_CHK_MENU_TIP": "Modifica  suggerimento del menu della configurazione dei plugin",
-    "VTLANG_JSON_CHK_MENU_CLASS": "Modifica classe menu configurazione plugin",
-    "VTLANG_JSON_CHK_INJECTION": "Modifica injection della configurazione plugin",
-    "VTLANG_JSON_CHK_AUTO_MEMDISK": "Modifica  memdisk automatico della configurazione dei plugin",
-    "VTLANG_JSON_CHK_IMG_LIST": "Modifica elenco immagini configurazione plugin",
-    "VTLANG_JSON_CHK_IMG_BLIST": "Modifica elenco immagini vietate configurazione plugin",
-    "VTLANG_JSON_CHK_CONF_REPLACE": "Modifica sostituzione configurazione di avvio configurazione dei plugin",
-    "VTLANG_JSON_CHK_DUD": "Modifica dud configurazione plugin",
-    "VTLANG_JSON_CHK_PASSWORD": "Modifica password configurazione plugin",
-    
-    "VTLANG_NORMAL_MODE": "Avvia in modalità normale",
-    "VTLANG_WIMBOOT_MODE": "Avvia in modalità wimboot",
-    "VTLANG_GRUB2_MODE": "Avvia in modalità grub2",
-    "VTLANG_MEMDISK_MODE": "Avvia in modalità memdisk",
-    
-    "VTLANG_RET_TO_LISTVIEW": "Torna alla VistaElenco",
-    "VTLANG_RET_TO_TREEVIEW": "Torna alla VistaStruttura",
-    
-    "VTLANG_NO_AUTOINS_SCRIPT": "Avvia senza il modello installazione automatica",
-    "VTLANG_AUTOINS_USE": "Avvia con",
-    
-    "VTLANG_NO_PERSIST": "Avvia senza persistenza",
-    "VTLANG_PERSIST_USE": "Avvia con",
-    
-    "VTLANG_BROWER_RETURN": "Indietro",
-    
-    "VTLANG_ENTER_EXIT": "Premi il tasto 'Invio' per uscire",
-    "VTLANG_ENTER_REBOOT": "Premi il tasto 'Invio' per riavviare",
-    "VTLANG_ENTER_CONTINUE": "Premi il tasto 'Invio' per continuare",
-    
-    "VTLANG_CTRL_TEMP_SET": "Impostazioni controllo temporaneo",
-    "VTLANG_WIN11_BYPASS_CHECK": "Durante l'installazione di Windows 11 bypassa il controllo CPU/TPM/SecureBoot ",
-    "VTLANG_WIN11_BYPASS_NRO": "Durante l'installazione di Windows 11 bypassa il requisito di un account online ",
-    "VTLANG_LINUX_REMOUNT": "Dopo l'avvio di Linux monta la partizione Ventoy ",
-    "VTLANG_SECONDARY_BOOT_MENU": "Visualizza menu di avvio secondario",
-    
-    "MENU_STR_XXX": ""
-}

INSTALL/grub/menu/ru_RU.json

@@ -1,8 +1,8 @@
 {
     "VTLANG_LANGUAGE_NAME": "Russian (Русский)",
     
-    "VTLANG_STR_HOTKEY_LIST": "L:Язык  F1:Помощь  F2:Обзор  F3:ВидСписок  F4:ЛокалЗагрузка  F5:Сервис  F6:РасширМеню",
+    "VTLANG_STR_HOTKEY_LIST": "L:Язык  F1:Помощь  F2:Просмотр  F3:ВидСписком  F4:Локальная загрузка  F5:Инструменты  F6:Выйти из меню",
-    "VTLANG_STR_HOTKEY_TREE": "L:Язык  F1:Помощь  F2:Обзор  F3:ВидДерево  F4:ЛокалЗагрузка  F5:Сервис  F6:РасширМеню",
+    "VTLANG_STR_HOTKEY_TREE": "L:Язык  F1:Помощь  F2:Просмотр  F3:ВидДревом  F4:Локальная загрузка  F5:Инструменты  F6:Выйти из меню",
     "VTLANG_RETURN_PREVIOUS": "Вернуться в предыдущее меню [Esc]",
     "VTLANG_RETURN_PRV_NOESC": "Вернуться в предыдущее меню",
     
@@ -37,13 +37,13 @@
     "VTLANG_HWINFO": "Сведения об оборудовании",
     
     "VTLANG_RESOLUTION_CFG": "Конфигурация разрешения",
-    "VTLANG_SCREEN_MODE": "Режим отображения экрана",
+    "VTLANG_SCREEN_MODE": "Режим Screen Display",
     "VTLANG_SCREEN_TEXT_MODE": "Выбрать текстовый режим",
     "VTLANG_SCREEN_GUI_MODE": "Выбрать графический режим",
     
     "VTLANG_THEME_SELECT": "Выбор темы",
     
-    "VTLANG_UEFI_UTIL": "Утилиты UEFI Ventoy",
+    "VTLANG_UEFI_UTIL": "UEFI утилиты Ventoy",
     "VTLANG_UTIL_SHOW_EFI_DRV": "Показать драйверы EFI",
     "VTLANG_UTIL_FIX_BLINIT_FAIL": "Исправить ошибку Windows «BlinitializeLibrary»",
     

INSTALL/grub/menu/vi_VN.json

@@ -1,93 +0,0 @@
-{
-    "VTLANG_LANGUAGE_NAME": "Vietnamese (Tiếng Việt)",
-    
-    "VTLANG_STR_HOTKEY_LIST": "L:Ngôn ngữ  F1:Trợ giúp  F2:Duyệt  F3:ListView  F4:Khởi động cục bộ  F5:Công cụ  F6:ExMenu",
-    "VTLANG_STR_HOTKEY_TREE": "L:Ngôn ngữ  F1:Trợ giúp  F2:Duyệt  F3:TreeView  F4:Khởi động cục bộ  F5:Công cụ  F6:ExMenu",
-    "VTLANG_RETURN_PREVIOUS": "Trở về menu trước [Esc]",
-    "VTLANG_RETURN_PRV_NOESC": "Trở về menu trước",
-    
-    "VTLANG_MENU_LANG": "Chọn ngôn ngữ menu",
-    
-    "VTLANG_LB_SBOOT_WINDOWS": "Tìm kiếm và khởi động Windows",
-    "VTLANG_LB_SBOOT_G4D": "Tìm kiếm và khởi động Grub4dos",
-    "VTLANG_LB_SBOOT_HDD1": "Khởi động từ ổ đĩa thứ 1 ở trên máy",
-    "VTLANG_LB_SBOOT_HDD2": "Khởi động từ ổ đĩa thứ 2 ở trên máy",
-    "VTLANG_LB_SBOOT_HDD3": "Khởi động từ ổ đĩa thứ 3 ở trên máy",
-    "VTLANG_LB_SBOOT_X64EFI": "Tìm kiếm và khởi động BOOTX64.EFI",
-    "VTLANG_LB_SBOOT_IA32EFI": "Tìm kiếm và khởi động BOOTIA32.EFI",
-    "VTLANG_LB_SBOOT_AA64EFI": "Tìm kiếm và khởi động BOOTAA64.EFI",
-    "VTLANG_LB_SBOOT_XORBOOT": "Tìm kiếm và khởi động xorboot",
-    
-    "VTLANG_FILE_CHKSUM": "Checksum tệp",
-    "VTLANG_CHKSUM_MD5_CALC": "Tính md5sum",
-    "VTLANG_CHKSUM_SHA1_CALC": "Tính sha1sum",
-    "VTLANG_CHKSUM_SHA256_CALC": "Tính sha256sum",
-    "VTLANG_CHKSUM_SHA512_CALC": "Tính sha512sum",
-    "VTLANG_CHKSUM_MD5_CALC_CHK": "Tính và kiểm tra md5sum",
-    "VTLANG_CHKSUM_SHA1_CALC_CHK": "Tính và kiểm tra sha1sum",
-    "VTLANG_CHKSUM_SHA256_CALC_CHK": "Tính và kiểm tra sha256sum",
-    "VTLANG_CHKSUM_SHA512_CALC_CHK": "Tính và kiểm tra sha512sum",
-    
-    "VTLANG_POWER": "Nguồn điện",
-    "VTLANG_POWER_REBOOT": "Khởi động lại",
-    "VTLANG_POWER_HALT": "Tắt máy",
-    "VTLANG_POWER_BOOT_EFIFW": "Khởi động lại vào cài đặt UEFI",
-    
-    "VTLANG_KEYBRD_LAYOUT": "Bố cục bàn phím",
-    "VTLANG_HWINFO": "Thông tin phần cứng",
-    
-    "VTLANG_RESOLUTION_CFG": "Cấu hình độ phân giải",
-    "VTLANG_SCREEN_MODE": "Chế độ hiển thị",
-    "VTLANG_SCREEN_TEXT_MODE": "Bắt buộc giao diện văn bản",
-    "VTLANG_SCREEN_GUI_MODE": "Bắt buộc giao diện đồ hoạ",
-    
-    "VTLANG_THEME_SELECT": "Chọn chủ đề",
-    
-    "VTLANG_UEFI_UTIL": "Các tiện ích UEFI Ventoy",
-    "VTLANG_UTIL_SHOW_EFI_DRV": "Hiển thị các driver EFI",
-    "VTLANG_UTIL_FIX_BLINIT_FAIL": "Sửa lỗi BlinitializeLibrary của Windows",
-    
-    "VTLANG_JSON_CHK_JSON": "Kiểm tra cấu hình plugin json (ventoy.json)",
-    "VTLANG_JSON_CHK_CONTROL": "Kiểm tra cấu hình plugin điều khiển toàn cục",
-    "VTLANG_JSON_CHK_THEME": "Kiểm tra cấu hình plugin chủ đề",
-    "VTLANG_JSON_CHK_AUTOINS": "Kiểm tra cấu hình plugin tự động cài đặt",
-    "VTLANG_JSON_CHK_PERSIST": "Kiểm tra cấu hình plugin persistence",
-    "VTLANG_JSON_CHK_MENU_ALIAS": "Kiểm tra cấu hình plugin alias menu",
-    "VTLANG_JSON_CHK_MENU_TIP": "Kiểm tra cấu hình plugin tip menu",
-    "VTLANG_JSON_CHK_MENU_CLASS": "Kiểm tra cấu hình plugin lớp menu",
-    "VTLANG_JSON_CHK_INJECTION": "Kiểm tra cấu hình plugin injection",
-    "VTLANG_JSON_CHK_AUTO_MEMDISK": "Kiểm tra cấu hình plugin auto memdisk",
-    "VTLANG_JSON_CHK_IMG_LIST": "Kiểm tra cấu hình plugin danh sách ảnh đĩa",
-    "VTLANG_JSON_CHK_IMG_BLIST": "Kiểm tra cấu hình plugin danh sách đen ảnh đĩa",
-    "VTLANG_JSON_CHK_CONF_REPLACE": "Kiểm tra cấu hình plugin boot replace conf",
-    "VTLANG_JSON_CHK_DUD": "Kiểm tra cấu hình plugin dud",
-    "VTLANG_JSON_CHK_PASSWORD": "Kiểm tra cấu hình plugin mật khẩu",
-    
-    "VTLANG_NORMAL_MODE": "Khởi động ở chế độ bình thường",
-    "VTLANG_WIMBOOT_MODE": "Khởi động ở chế độ wimboot",
-    "VTLANG_GRUB2_MODE": "Khởi động ở chế độ GRUB2",
-    "VTLANG_MEMDISK_MODE": "Khởi động ở chế độ memdisk",
-    
-    "VTLANG_RET_TO_LISTVIEW": "Trở về ListView",
-    "VTLANG_RET_TO_TREEVIEW": "Trở về TreeView",
-    
-    "VTLANG_NO_AUTOINS_SCRIPT": "Khởi động không dùng mẫu cài đặt",
-    "VTLANG_AUTOINS_USE": "Khởi động với",
-    
-    "VTLANG_NO_PERSIST": "Khởi động không có persistence",
-    "VTLANG_PERSIST_USE": "Khởi động với",
-    
-    "VTLANG_BROWER_RETURN": "Trở về",
-    
-    "VTLANG_ENTER_EXIT": "nhấn Enter để thoát",
-    "VTLANG_ENTER_REBOOT": "nhấn Enter để khởi động lại",
-    "VTLANG_ENTER_CONTINUE": "nhấn enter để tiếp tục",
-    
-    "VTLANG_CTRL_TEMP_SET": "Cài đặt điều khiển tạm",
-    "VTLANG_WIN11_BYPASS_CHECK": "Bỏ qua kiểm tra CPU/TPM/SecureBoot khi cài đặt Windows 11",
-    "VTLANG_WIN11_BYPASS_NRO": "Bỏ qua yêu cầu tài khoản trực tuyến khi cài đặt Windows 11",
-    "VTLANG_LINUX_REMOUNT": "Gắn phân vùng Ventoy sau khi khởi động GNU/Linux",
-    "VTLANG_SECONDARY_BOOT_MENU": "Hiện menu khởi động thứ cấp`",
-    
-    "MENU_STR_XXX": ""
-}

INSTALL/tool/VentoyWorker.sh

@@ -195,7 +195,7 @@ if [ "$MODE" = "install" -a -z "$NONDESTRUCTIVE" ]; then
     fi
     
     if [ "$PARTTOOL" = "parted" ]; then
-        if parted -s $DISK p 2>&1 | grep -i -q 'sector size.*4096.*4096'; then
+        if parted $DISK p | grep -i -q 'sector size.*4096.*4096'; then
             vterr "Currently Ventoy does not support 4K native device."
             exit 1
         fi

INSTALL/tool/ventoy_lib.sh

@@ -92,10 +92,6 @@ get_disk_part_name() {
         echo ${DISK}p${2}
     elif echo $DISK | grep -q "/dev/nbd[0-9]"; then
         echo ${DISK}p${2}
-    elif echo $DISK | grep -q "/dev/zd[0-9]"; then
-        echo ${DISK}p${2}
-    elif echo $DISK | grep -q "/dev/md[0-9]"; then
-        echo ${DISK}p${2}
     else
         echo ${DISK}${2}
     fi
@@ -213,14 +209,14 @@ get_disk_ventoy_version() {
 wait_and_create_part() {
     vPART1=$1
     vPART2=$2
-    echo 'Wait for partitions $vPART1 and $vPART2 ...'
+    echo 'Wait for partitions ...'
     for i in 0 1 2 3 4 5 6 7 8 9; do
         if ls -l $vPART1 2>/dev/null | grep -q '^b'; then
             if ls -l $vPART2 2>/dev/null | grep -q '^b'; then
                 break
             fi
         else
-            echo "Wait for $vPART1 and $vPART2 ..."
+            echo "Wait for $vPART1/$vPART2 ..."
             sleep 1
         fi
     done

LANGUAGES/languages.json

@@ -754,7 +754,7 @@
         "STR_SHOW_ALL_DEV":"Alle Geräte anzeigen",
         "STR_PART_ALIGN_4KB":"Richten Sie Partitionen mit 4KB aus",
         "STR_WEB_COMMUNICATION_ERR":"Kommunikationsfehler:",
-        "STR_WEB_REMOTE_ABNORMAL":"Kommunikationsfehler: Unnormales Verhalten",
+        "STR_WEB_REMOTE_ABNORMAL":"Kommunikationsfehler: unnormales Verhalten",
         "STR_WEB_REQUEST_TIMEOUT":"Kommunikationsfehler: Zeitüberschreitung der Anforderung",
         "STR_WEB_SERVICE_UNAVAILABLE":"Kommunikationsfehler: Dienst nicht verfügbar",
         "STR_WEB_TOKEN_MISMATCH":"Daemon-Status aktualisiert, bitte später erneut versuchen.",
@@ -763,19 +763,19 @@
         "STR_VTSI_CREATE_TIP":"Es wird nur eine VTSI-Datei erstellt und nichts auf ein Gerät geschrieben.#@Fortfahren?",
         "STR_VTSI_CREATE_SUCCESS":"VTSI-Datei erfolgreich erstellt!#@Sie können Rufus(3.15+) zum auf das Gerät schreiben verwenden um die Installation von Ventoy fertigzustellen.",
         "STR_VTSI_CREATE_FAILED":"VTSI-Datei konnte nicht erstellt werden.",
-        "STR_MENU_PART_RESIZE":"Zerstörungsfreie Installation",
+        "STR_MENU_PART_RESIZE":"zerstörungsfreie Installation",
         "STR_PART_RESIZE_TIP":"Ventoy wird eine Installation ohne vorherige Formatierung versuchen. #@Fortfahren?",
         "STR_PART_RESIZE_SUCCESS":"Glückwunsch!#@Die Installation von Ventoy, ohne vorherige Formatierung, wurde erfolgreich abgeschlossen.",
-        "STR_PART_RESIZE_FAILED":"Installation ohne vorherige Formatierung fehlgeschlagen. Details dazu finden Sie in log.txt.",
+        "STR_PART_RESIZE_FAILED":"Installation ohne vorherige Formatierung fehlgeschlagen. Für Details die log.txt prüfen.",
-        "STR_PART_RESIZE_UNSUPPORTED":"Aufgrund einiger nicht erfüllbarer Bedingungen wurde die Installation, ohne vorherige Formatierung, gestoppt. Details dazu finden Sie in log.txt.",
+        "STR_PART_RESIZE_UNSUPPORTED":"Installation ohne vorherige Formatierung wurde auf Grund einiger nicht erfüllbarer Bedingungen gestoppt. Für Details die log.txt prüfen.",
         "STR_INSTALL_YES_TIP1":"Warnung: Die Daten gehen verloren!",
-        "STR_INSTALL_YES_TIP2":"Bitte bestätigen Sie die untere Textbox, um eine Neuinstallation durchzuführen.",
+        "STR_INSTALL_YES_TIP2":"Bitte bestätigen Sie in der unteren Textbox mit YES, dass Sie anstelle eines Upgrades eine frische Installation durchführen möchten.",
         "STR_PART_VENTOY_FS":"Dateisystem für die Ventoy-Partition",
         "STR_PART_FS":"Dateisystem",
         "STR_PART_CLUSTER":"Clustergröße",
         "STR_PART_CLUSTER_DEFAULT":"Systemstandardwert",
         "STR_DONATE":"Spenden",
-        "STR_4KN_UNSUPPORTED":"Ventoy unterstützt derzeit keine nativen 4K-Geräte.",
+        "STR_4KN_UNSUPPORTED":"Ventoy unterstützt derzeit keine nativen 4K Geräte.",
         
         "STRXXX":""
     },
@@ -1496,63 +1496,63 @@
     {
         "name":"Japanese (日本語)",
         "FontFamily":"Yu Gothic UI",
-        "FontSize":16,
+        "FontSize":14,
-        "Author":"taichi eto, Bentnand, cmplstofB, Re*Index.(ot_inc)",
+        "Author":"taichi eto, Bentnand, cmplstofB",
         
         "STR_ERROR":"エラー",
         "STR_WARNING":"警告",
         "STR_INFO":"情報",
-        "STR_INCORRECT_DIR":"正しいディレクトリで実行してください!",
+        "STR_INCORRECT_DIR":"正しいディレクトリーで実行してください",
-        "STR_INCORRECT_TREE_DIR":"ここで実行をしないでください。リリースされたインストールパッケージをダウンロードして、実行をしてください。",
+        "STR_INCORRECT_TREE_DIR":"この場所で実行するには、パッケージを導入してください。",
-        "STR_DEVICE":"デバイス",
+        "STR_DEVICE":"機器",
-        "STR_LOCAL_VER":"パッケージ内のVentoy",
+        "STR_LOCAL_VER":"パッケージ中のVentoy",
-        "STR_DISK_VER":"デバイス内のVentoy",
+        "STR_DISK_VER":"機器中のVentoy",
         "STR_STATUS":"状態 - 準備完了",
-        "STR_INSTALL":"インストール",
+        "STR_INSTALL":"導入",
-        "STR_UPDATE":"アップデート",
+        "STR_UPDATE":"更新",
-        "STR_UPDATE_TIP":"アップグレードの操作は安全に行なわれ、ISOファイルは変更もされません。#@続行しますか?",
+        "STR_UPDATE_TIP":"更新可能です、ISOファイルは改変されません。#@続行しますか？",
-        "STR_INSTALL_TIP":"デバイスはフォーマットされ、すべてのデータが失われます。#@続行しますか?",
+        "STR_INSTALL_TIP":"選択した機器は完全に初期化され、保存されたデータは二度と復元できません。#@続行しますか？",
-        "STR_INSTALL_TIP2":"デバイスはフォーマットされ、すべてのデータが失われます。#@続行しますか? (再確認)",
+        "STR_INSTALL_TIP2":"選択した機器は完全に初期化され、保存されたデータは二度と復元できません。#@続行しますか？（再確認）",
-        "STR_INSTALL_SUCCESS":"おめでとうございます!#@Ventoyがデバイスにインストールされました。",
+        "STR_INSTALL_SUCCESS":"おめでとうございます。#@Ventoyの導入は正常に行われました。",
-        "STR_INSTALL_FAILED":"インストール中にエラーが発生しました。USBデバイスを再接続をして再試行ができます。詳細については、log.txtを確認してください。何度も失敗する場合は、公式サイト内のFAQをご参照ください。",
+        "STR_INSTALL_FAILED":"導入中にエラーが発生しました。機器を再接続してもう一度やり直してください。詳細な記録はlog.txtにあります。",
-        "STR_UPDATE_SUCCESS":"おめでとうございます!#@Ventoyがデバイスで正常にアップデートされました。",
+        "STR_UPDATE_SUCCESS":"おめでとうございます。#@Ventoyの更新は正常に行われました。",
-        "STR_UPDATE_FAILED":"アップデート中にエラーが発生しました。USBデバイスを再接続して再試行ができます。詳細については、log.txtを確認してください。何度も失敗する場合は、公式サイトのFAQをご参照ください。",
+        "STR_UPDATE_FAILED":"更新中にエラーが発生しました。機器を再接続してもう一度やり直してください。詳細な記録はlog.txtにあります。",
-        "STR_WAIT_PROCESS":"スレッドが実行中です。お待ちください...",
+        "STR_WAIT_PROCESS":"スレッドが稼動しています。お待ちください...",
-        "STR_MENU_OPTION":"オプション",
+        "STR_MENU_OPTION":"設定",
-        "STR_MENU_SECURE_BOOT":"セキュアブートのサポート",
+        "STR_MENU_SECURE_BOOT":"セキュアブート",
-        "STR_MENU_PART_CFG":"パーティションの設定",
+        "STR_MENU_PART_CFG":"区画構成",
-        "STR_BTN_OK":"OK",
+        "STR_BTN_OK":"了解",
-        "STR_BTN_CANCEL":"キャンセル",
+        "STR_BTN_CANCEL":"取消",
-        "STR_PRESERVE_SPACE":"ディスクの最後にある程度の容量を確保する",
+        "STR_PRESERVE_SPACE":"機器の最後に領域を確保する",
-        "STR_SPACE_VAL_INVALID":"システム予約済みパーティションの値が無効です",
+        "STR_SPACE_VAL_INVALID":"確保する領域の値が正しくありません",
-        "STR_MENU_CLEAR":"Ventoyを削除する",
+        "STR_MENU_CLEAR":"Ventoyを削除",
-        "STR_CLEAR_SUCCESS":"Ventoyがデバイスから正常に削除されました。",
+        "STR_CLEAR_SUCCESS":"Ventoyが機器から削除されました。",
-        "STR_CLEAR_FAILED":"Ventoyをディスクから削除するときにエラーが発生しました。USBデバイスを再接続して再試行ができます。詳細については、log.txtを確認してください。",
+        "STR_CLEAR_FAILED":"Ventoyを機器から削除できませんでした。機器を再接続してもう一度やり直してください。詳細な記録はlog.txtにあります。",
-        "STR_MENU_PART_STYLE":"パーティションのスタイル",
+        "STR_MENU_PART_STYLE":"区画の構成方式",
-        "STR_DISK_2TB_MBR_ERROR":"2TBを超えるデバイスの場合はGPTを選択してください",
+        "STR_DISK_2TB_MBR_ERROR":"2TB以上の機器にはGPTを使用してください。",
-        "STR_SHOW_ALL_DEV":"すべてのデバイスを表示",
+        "STR_SHOW_ALL_DEV":"すべての機器を表示",
-        "STR_PART_ALIGN_4KB":"パーティションを4KBに揃える",
+        "STR_PART_ALIGN_4KB":"区画単位を4KBに揃える",
-        "STR_WEB_COMMUNICATION_ERR":"コミュニケーションエラー:",
+        "STR_WEB_COMMUNICATION_ERR":"通信エラー:",
-        "STR_WEB_REMOTE_ABNORMAL":"コミュニケーションエラー: リモート先が異常になっています",
+        "STR_WEB_REMOTE_ABNORMAL":"通信エラー: 通信先で異常が発生しています",
-        "STR_WEB_REQUEST_TIMEOUT":"コミュニケーションエラー: リクエストがタイムアウトしました",
+        "STR_WEB_REQUEST_TIMEOUT":"通信エラー: 要求が時間切れしました",
-        "STR_WEB_SERVICE_UNAVAILABLE":"コミュニケーションエラー: サービスが利用できません",
+        "STR_WEB_SERVICE_UNAVAILABLE":"通信エラー: サービスが利用できません",
-        "STR_WEB_TOKEN_MISMATCH":"デーモンのステータスが更新されました。後で再試行してください。",
+        "STR_WEB_TOKEN_MISMATCH":"デーモンの状態が更新されました。しばらくしてから再試行してください。",
-        "STR_WEB_SERVICE_BUSY":"サービスがビジーの状態です。後で再試行してください。",
+        "STR_WEB_SERVICE_BUSY":"サービスが繁忙です。後で再試行してください。",
-        "STR_MENU_VTSI_CREATE":"VTSIファイルを作成する",
+        "STR_MENU_VTSI_CREATE":"VTSIファイルを生成する",
-        "STR_VTSI_CREATE_TIP":"今回はデバイスへの書き込みを行なわず、VTSIファイルの作成のみを行ないます。#@続行しますか?",
+        "STR_VTSI_CREATE_TIP":"VTSIファイルを生成し，記憶装置への書き込みは行いません。#@続行しますか？",
-        "STR_VTSI_CREATE_SUCCESS":"VTSIファイルが正常に作成されました!#@Rufus(3.15以降)を使用してデバイスに書き込むことでVentoyのインストールが完了します。",
+        "STR_VTSI_CREATE_SUCCESS":"VTSIファイルが生成されました。#@Rufus（3.15以上の版）を使って記憶装置に書き込んで，Ventoyの導入を完遂しましょう。",
-        "STR_VTSI_CREATE_FAILED":"VTSIファイルの作成に失敗しました。",
+        "STR_VTSI_CREATE_FAILED":"VTSIファイルを生成できませんでした。",
-        "STR_MENU_PART_RESIZE":"非破壊なインストール",
+        "STR_MENU_PART_RESIZE":"非破壊的導入",
-        "STR_PART_RESIZE_TIP":"Ventoyは、可能であれば非破壊なインストールを試みます。#@続行しますか?",
+        "STR_PART_RESIZE_TIP":"Ventoyを（可能であれば）非破壊的に導入します。#@続行しますか？",
-        "STR_PART_RESIZE_SUCCESS":"おめでとうございます!#@Ventoyの非破壊なインストールが正常に完了しました。",
+        "STR_PART_RESIZE_SUCCESS":"おめでとうございます。#@Ventoyの非破壊的導入は正常に行われました。",
-        "STR_PART_RESIZE_FAILED":"非破壊なインストールが失敗しました。詳細については、log.txtを確認してください。",
+        "STR_PART_RESIZE_FAILED":"Ventoyを非破壊的に導入できませんでした。詳細な記録はlog.txtにあります。",
-        "STR_PART_RESIZE_UNSUPPORTED":"いくつかの条件を満たしていないため、Ventoyの非破壊なインストールは停止されました。詳細については、log.txtを確認してください。",
+        "STR_PART_RESIZE_UNSUPPORTED":"Ventoyを非破壊的に導入できませんでした。非破壊的導入にあたっての要件が満たされていません。詳細な記録はlog.txtにあります。",
-        "STR_INSTALL_YES_TIP1":"警告: データが失われます!",
+        "STR_INSTALL_YES_TIP1":"警告: データが消去されます",
-        "STR_INSTALL_YES_TIP2":"アップグレードではなく新規インストールを実行するには、下のテキストボックスに「YES」と入力してください。",
+        "STR_INSTALL_YES_TIP2":"Ventoyを更新するのではなく新規に導入するということを確認するために，下の入力欄に「YES」と入力してください。",
         "STR_PART_VENTOY_FS":"Ventoy パーティションのファイル システム",
         "STR_PART_FS":"ファイルシステム",
-        "STR_PART_CLUSTER":"クラスタサイズ",
+        "STR_PART_CLUSTER":"クラスターサイズ",
-        "STR_PART_CLUSTER_DEFAULT":"システムの既定値",
+        "STR_PART_CLUSTER_DEFAULT":"システムのデフォルト値",
         "STR_DONATE":"寄付",
         "STR_4KN_UNSUPPORTED":"現在、Ventoy は 4K ネイティブ デバイスをサポートしていません。",
         
@@ -1575,13 +1575,13 @@
         "STR_STATUS":"Stato - PRONTO",
         "STR_INSTALL":"Installa",
         "STR_UPDATE":"Aggiorna",
-        "STR_UPDATE_TIP":"L'aggiornamento è sicuro, i file presenti nel dispositivo rimarranno invariati.#@#@Vuoi continuare?",
+        "STR_UPDATE_TIP":"L'aggiornamento è sicuro, i file presenti nel dispositivo rimarranno invariati.#@Vuoi continuare?",
-        "STR_INSTALL_TIP":"Il dispositivo verrà formattato e tutti i dati saranno persi.#@#@Vuoi continuare?",
+        "STR_INSTALL_TIP":"Il dispositivo verrà formattato e tutti i dati saranno persi.#@Vuoi continuare?",
-        "STR_INSTALL_TIP2":"Il dispositivo verrà formattato e tutti i dati saranno persi.#@#@Vuoi continuare (seconda verifica)?",
+        "STR_INSTALL_TIP2":"Il dispositivo verrà formattato e tutti i dati saranno persi.#@Vuoi continuare (seconda verifica)?",
-        "STR_INSTALL_SUCCESS":"Congratulazioni!#@#@Installazione di Ventoy nel dispositivo completata.",
+        "STR_INSTALL_SUCCESS":"Congratulazioni!#@Installazione di Ventoy nel dispositivo completata.",
-        "STR_INSTALL_FAILED":"Si è verificato un errore durante l'installazione.#@#@Riconnetti il dispositivo e riprova.#@#@Per i dettagli controlla il file log.txt .",
+        "STR_INSTALL_FAILED":"Si è verificato un errore durante l'installazione.#@Riconnetti il dispositivo e riprova.#@Controlla il file log.txt per i dettagli.",
-        "STR_UPDATE_SUCCESS":"Congratulazioni!#@#@Aggiornamento di Ventoy nel dispositivo completato",
+        "STR_UPDATE_SUCCESS":"Congratulazioni!#@Aggiornamento di Ventoy nel dispositivo completato",
-        "STR_UPDATE_FAILED":"Si è verificato un errore durante l'aggiornamento.#@È possibile riconnettere il dispositivo USB e riprovare.#@Per i dettagli controlla il file log.txt.#@Se l'aggiornamento non va a buon fine, consulta le FAQ sul sito ufficiale",
+        "STR_UPDATE_FAILED":"Si è verificato un errore durante l'aggiornamento.#@È possibile riconnettere il dispositivo USB e riprovare.#@Controlla il file log.txt per i dettagli. Se l'aggiornamento non va a buon fine, consulta le FAQ sul sito ufficiale",
         "STR_WAIT_PROCESS":"Un processo è in esecuzione. Attendi...",
         "STR_MENU_OPTION":"Opzioni",
         "STR_MENU_SECURE_BOOT":"Avvio protetto (secure boot)",
@@ -1592,28 +1592,28 @@
         "STR_SPACE_VAL_INVALID":"Quantità di spazio da riservare non valida",
         "STR_MENU_CLEAR":"Rimuovi Ventoy dal dispositivo",
         "STR_CLEAR_SUCCESS":"Rimozione di Ventoy dal dispositivo completata.",
-        "STR_CLEAR_FAILED":"Si è verificato un errore durante la rimozione di Ventoy dal dispositivo.#@È possibile riconnettere il dispositivo USB e riprovare.#@Per i dettagli controlla il file log.txt ",
+        "STR_CLEAR_FAILED":"Si è verificato un errore durante la rimozione di Ventoy dal dispositivo.#@È possibile riconnettere il dispositivo USB e riprovare.#@Controlla il file log.txt per i dettagli",
         "STR_MENU_PART_STYLE":"Stile tabella partizioni",
         "STR_DISK_2TB_MBR_ERROR":"Seleziona GPT per i dispositivi più grandi di 2TB",
         "STR_SHOW_ALL_DEV":"Visualizza tutti i dispositivi",
         "STR_PART_ALIGN_4KB":"Allinea le partizioni con 4KB",
         "STR_WEB_COMMUNICATION_ERR":"Errore di comunicazione:",
-        "STR_WEB_REMOTE_ABNORMAL":"Errore di comunicazione: remoto non normale",
+        "STR_WEB_REMOTE_ABNORMAL":"Errore di comunicazione: remoto anormale",
         "STR_WEB_REQUEST_TIMEOUT":"Errore di comunicazione: richiesta scaduta",
         "STR_WEB_SERVICE_UNAVAILABLE":"Errore di comunicazione: servizio non disponibile",
-        "STR_WEB_TOKEN_MISMATCH":"Stato del demon aggiornato. Riprova più tardi.",
+        "STR_WEB_TOKEN_MISMATCH":"Stato del demone aggiornato. Riprova più tardi.",
         "STR_WEB_SERVICE_BUSY":"Il servizio è occupato. Riprova più tardi.",
         "STR_MENU_VTSI_CREATE":"Genera file VTSI",
-        "STR_VTSI_CREATE_TIP":"Questa volta non scriverà sul dispositivo, ma genererà solo un file VTSI#@#@Vuoi continuare?",
+        "STR_VTSI_CREATE_TIP":"Questa volta non scriverà sul dispositivo, ma genererà solo un file VTSI#@Vuoi continuare?",
         "STR_VTSI_CREATE_SUCCESS":"Creazione file VTSI completata!#@Per scriverlo nel dispositivo in modo da completare l'installazione di Ventoy puoi usare Rufus (versione 3.15 o successiva).",
         "STR_VTSI_CREATE_FAILED":"Creazione file VTSI non riuscita.",
         "STR_MENU_PART_RESIZE":"Installazione non distruttiva",
-        "STR_PART_RESIZE_TIP":"Ventoy proverà, se possibile, l'installazione non distruttiva.#@#@Vuoi continuare?",
+        "STR_PART_RESIZE_TIP":"Ventoy proverà, se possibile, l'installazione non distruttiva.#@Vuoi continuare?",
         "STR_PART_RESIZE_SUCCESS":"Congratulazioni!#@Installazione non distruttiva di Ventoy completata.",
         "STR_PART_RESIZE_FAILED":"Installazione non distruttiva fallita.#@Controlla il file log.txt per i dettagli.",
         "STR_PART_RESIZE_UNSUPPORTED":"L'installazione non distruttiva di Ventoy è stata interrotta perché alcune condizioni non possono essere soddisfatte.#@Controlla il file log.txt per i dettagli.",
         "STR_INSTALL_YES_TIP1":"Attenzione: i dati verranno persi!",
-        "STR_INSTALL_YES_TIP2":"Per confermare che vuoi davvero eseguire un'installazione pulita anziché un aggiornamento digita YES nella casella di testo qui sotto .",
+        "STR_INSTALL_YES_TIP2":"Digita YES nella casella di testo qui sotto per confermare che vuoi davvero eseguire un'installazione pulita anziché un aggiornamento.",
         "STR_PART_VENTOY_FS":"File system partizione Ventoy",
         "STR_PART_FS":"File system",
         "STR_PART_CLUSTER":"Dimensione cluster",
@@ -2082,7 +2082,7 @@
         "name":"Vietnamese (Tiếng Việt)",
         "FontFamily":"Tahoma",
         "FontSize":14,
-        "Author":"Nguyen Quoc Hoang - cuumay.win, HoangNPV - @isoamyl50",
+        "Author":"Nguyen Quoc Hoang - cuumay.win",
         
         "STR_ERROR":"Lỗi",
         "STR_WARNING":"Cảnh báo",
@@ -2099,9 +2099,9 @@
         "STR_INSTALL_TIP":"Thiết bị sẽ được định dạng và do đó TẤT CẢ DỮ LIỆU trên thiết bị sẽ bị mất.#@Bạn thật sự muốn tiếp tục?",
         "STR_INSTALL_TIP2":"Thiết bị sẽ được định dạng và do đó TẤT CẢ DỮ LIỆU trên thiết bị sẽ bị mất.#@Bạn thật sự muốn tiếp tục? (Xác nhận lần hai)",
         "STR_INSTALL_SUCCESS":"Chúc mừng bạn!#@Thiết bị đã được cài Ventoy thành công.",
-        "STR_INSTALL_FAILED":"Đã xảy ra lỗi trong quá trình cài đặt Ventoy. Bạn có thể cắm lại USB và thử lại. Xem chi tiết ở tệp log.txt. Nếu lỗi tiếp tục xảy ra, vui lòng đọc FAQ tại trang web chính thức.",
+        "STR_INSTALL_FAILED":"Đã xảy ra lỗi trong quá trình cài đặt Ventoy. Bạn có thể rút thiết bị ra và thử lại. Xem chi tiết ở tệp log.txt.",
         "STR_UPDATE_SUCCESS":"Chúc mừng bạn!#@Thiết bị đã được cập nhật Ventoy thành công.",
-        "STR_UPDATE_FAILED":"Đã xảy ra lỗi trong quá trình cập nhật Ventoy. Bạn có thể cắm lại USB và thử lại. Xem chi tiết ở tệp log.txt. Nếu lỗi tiếp tục xảy ra, vui lòng đọc FAQ tại trang web chính thức.",
+        "STR_UPDATE_FAILED":"Đã xảy ra lỗi trong quá trình cập nhật Ventoy. Bạn có thể rút thiết bị ra và thử lại. Xem chi tiết ở tệp log.txt.",
         "STR_WAIT_PROCESS":"Một luồng xử lý đang chạy, vui lòng chờ...",
         "STR_MENU_OPTION":"Tùy chọn",
         "STR_MENU_SECURE_BOOT":"Bật hỗ trợ Secure Boot",
@@ -2112,7 +2112,7 @@
         "STR_SPACE_VAL_INVALID":"Giá trị dung lượng giữ lại không hợp lệ.",
         "STR_MENU_CLEAR":"Gỡ bỏ Ventoy",
         "STR_CLEAR_SUCCESS":"Chúc mừng bạn!#@Thiết bị đã được gỡ bỏ Ventoy thành công.",
-        "STR_CLEAR_FAILED":"Đã xảy ra lỗi trong quá trình gỡ bỏ Ventoy. Bạn có thể cắm lại USB và thử lại. Xem chi tiết ở tệp log.txt.",
+        "STR_CLEAR_FAILED":"Đã xảy ra lỗi trong quá trình gỡ bỏ Ventoy. Bạn có thể rút thiết bị ra và thử lại. Xem chi tiết ở tệp log.txt.",
         "STR_MENU_PART_STYLE":"Kiểu phân vùng",
         "STR_DISK_2TB_MBR_ERROR":"Thiết bị có dung lượng lớn hơn 2TB. Vui lòng chọn Kiểu phân vùng là GPT.",
         "STR_SHOW_ALL_DEV":"Hiện tất cả Thiết bị",
@@ -2133,13 +2133,13 @@
         "STR_PART_RESIZE_FAILED":"Đã xảy ra lỗi trong quá trình cài Ventoy theo cách cài đặt không phá hủy. Xem chi tiết ở tệp log.txt.",
         "STR_PART_RESIZE_UNSUPPORTED":"Cài Ventoy theo cách cài đặt không phá hủy đã bị dừng lại vì chưa đúng điều kiện. Xem chi tiết ở tệp log.txt.",
         "STR_INSTALL_YES_TIP1":"Cảnh báo: Dữ liệu sẽ bị mất !",
-        "STR_INSTALL_YES_TIP2":"Vui lòng nhập YES vào ô bên dưới để xác nhận bạn muốn cài mới thay vì cài nâng cấp.",
+        "STR_INSTALL_YES_TIP2":"Vui lòng nhập YES vào textbox bên dưới để xác nhận bạn muốn cài mới thay vì cài nâng cấp.",
         "STR_PART_VENTOY_FS":"Hệ thống tập tin cho Phân vùng Ventoy",
         "STR_PART_FS":"Hệ thống tập tin",
-        "STR_PART_CLUSTER":"Kích thước Cluster",
+        "STR_PART_CLUSTER":"Cỡ Cluster",
-        "STR_PART_CLUSTER_DEFAULT":"Theo giá trị mặc định của hệ thống",
+        "STR_PART_CLUSTER_DEFAULT":"Theo mặc định hệ thống",
-        "STR_DONATE":"Ủng hộ tác giả",
+        "STR_DONATE":"Thưởng tác giả",
-        "STR_4KN_UNSUPPORTED":"Hiện tại Ventoy không hỗ trợ các thiết bị 4K native.",
+        "STR_4KN_UNSUPPORTED":"Currently Ventoy does not support 4K native devices.",
         
         "STRXXX":""
     },
@@ -2420,7 +2420,7 @@
         "STR_STATUS":"Status - SIAP",
         "STR_INSTALL":"Pasang",
         "STR_UPDATE":"Perbarui",
-        "STR_UPDATE_TIP":"Operasi pembaruan ini aman, tidak akan ada perubahan pada berkas ISO.#@Lanjutkan?",
+        "STR_UPDATE_TIP":"Operasi pembaruan ini aman, Tidak akan ada perubahan berkas ISO.#@Lanjutkan?",
         "STR_INSTALL_TIP":"Disk akan di-format dan semua data akan hilang.#@Lanjutkan?",
         "STR_INSTALL_TIP2":"Disk akan di-format dan semua data akan hilang.#@Lanjutkan? (YAKIN)",
         "STR_INSTALL_SUCCESS":"Selamat!#@Ventoy telah berhasil terpasang di perangkat ini.",
@@ -2434,11 +2434,11 @@
         "STR_BTN_OK":"OK",
         "STR_BTN_CANCEL":"Batal",
         "STR_PRESERVE_SPACE":"Menyisakan sejumlah ruang penyimpanan pada disk di bawah ini",
-        "STR_SPACE_VAL_INVALID":"Nilai sisa ruang tidak benar",
+        "STR_SPACE_VAL_INVALID":"Nilai sisa ruang tidak valid",
         "STR_MENU_CLEAR":"Bersihkan Ventoy",
         "STR_CLEAR_SUCCESS":"Ventoy telah berhasil dihapus pada perangkat ini.",
         "STR_CLEAR_FAILED":"Terjadi kesalahan ketika penghapusan berlangsung. Anda perlu mencabut-pasang ulang USB dan coba lagi. Periksa berkas log.txt untuk detil.",
-        "STR_MENU_PART_STYLE":"Model Partisi",
+        "STR_MENU_PART_STYLE":"Gaya Partisi",
         "STR_DISK_2TB_MBR_ERROR":"Silakan pilih GPT untuk disk yang lebih dari 2TB",
         "STR_SHOW_ALL_DEV":"Tampilkan semua perangkat",
         "STR_PART_ALIGN_4KB":"Meluruskan dengan partisi 4KB",
@@ -2458,7 +2458,7 @@
         "STR_PART_RESIZE_FAILED":"Pemasangan tanpa merusakkan gagal, periksa berkas log.txt untuk detil.",
         "STR_PART_RESIZE_UNSUPPORTED":"Pemasangan tanpa merusakkan Ventoy terhenti karena beberapa kondisi yang tidak mendukung. Periksa berkas log.txt untuk detil.",
         "STR_INSTALL_YES_TIP1":"Peringatan: Data akan hilang!",
-        "STR_INSTALL_YES_TIP2":"Silakan ketik YES pada kotak tulis di bawah untuk mengonfirmasikan bahwa anda memang yakin melakukan pemasangan baru ketimbang memperbaruinya",
+        "STR_INSTALL_YES_TIP2":"Silakan ketik YES pada kotak tulis di bawah untuk meyakinkan bahwa anda memang untuk melakukan pemasangan baru ketimbang memperbaruinya",
         "STR_PART_VENTOY_FS":"Berkas Sistem Untuk Partisi Ventoy",
         "STR_PART_FS":"Berkas Sistem",
         "STR_PART_CLUSTER":"Ukuran Kelompok",

Plugson/www/buildtime

@@ -1 +1 @@
-20231014 18:52:12
+20221204 15:15:33

Plugson/www/helplist

@@ -1 +1 @@
-ar_ARbn_BNcs_CZde_DEel_GRen_USes_ESfr_FRhi_HIhr_HRhu_HUid_IDit_ITja_JPka_GEko_KRpl_PLpt_BRpt_PTru_RUsr_RSta_INtr_TRuk_UAzh_CNzh_TW
+ar_ARbn_BNde_DEen_USes_ESfr_FRhi_HIhr_HRhu_HUid_IDja_JPka_GEko_KRpl_PLpt_PTru_RUsr_RSta_INtr_TRzh_CNzh_TW

Plugson/www/index.html

@@ -757,7 +757,7 @@
 
         <footer class="main-footer">
             <div class="pull-right hidden-xs">
-                <b id="plugson_build_date">20231014 18:52:12</b>
+                <b id="plugson_build_date">20221204 15:15:33</b>
             </div>
             <strong><a href="https://www.ventoy.net" target="_blank">https://www.ventoy.net</a></strong>
         </footer>
@@ -777,10 +777,10 @@
     <script src="/static/js/jQuery-2.1.4.min.js"></script>
     <!-- jquery validate -->
     <script src="/static/js/jquery.validate.min.js"></script>    
-    <script src="/static/js/jquery.validate.vtoymethods.js?v=192"></script>
+    <script src="/static/js/jquery.validate.vtoymethods.js?v=142"></script>
 
-    <script src="/static/js/jquery.vtoy.alert.js?v=192"></script>
+    <script src="/static/js/jquery.vtoy.alert.js?v=142"></script>
-    <script src="/static/js/vtoy.js?v=192"></script>
+    <script src="/static/js/vtoy.js?v=142"></script>
     <script src="/static/js/md5.min.js"></script>
 
     <!-- Bootstrap 3.3.5 -->

Plugson/www/menulist

@@ -1 +1 @@
-ar_ARbn_BNcs_CZde_DEel_GRen_USes_ESfr_FRhi_HIhr_HRhu_HUid_IDit_ITja_JPka_GEko_KRpl_PLpt_BRpt_PTru_RUsl_sisr_RSta_INtr_TRuk_UAzh_CNzh_TW
+ar_ARbn_BNde_DEen_USes_ESfr_FRhi_HIhr_HRhu_HUid_IDja_JPka_GEko_KRpl_PLpt_PTru_RUsr_RSta_INtr_TRzh_CNzh_TW

Plugson/www/plugson_password.html

@@ -185,13 +185,13 @@
     CommonPasswordEntry($tbl, 'efipwd', '所有 .efi 文件的默认密码。', 'Default password for all .efi files.');
     CommonPasswordEntry($tbl, 'vtoypwd', '所有 .vtoy 文件的默认密码。', 'Default password for all .vtoy files.');
 
-    $('input:password[id=id_bootpwd]').val(data.bootpwd);
+    $('input:text[id=id_bootpwd]').val(data.bootpwd);
-    $('input:password[id=id_isopwd]').val(data.isopwd);
+    $('input:text[id=id_isopwd]').val(data.isopwd);
-    $('input:password[id=id_wimpwd]').val(data.wimpwd);
+    $('input:text[id=id_wimpwd]').val(data.wimpwd);
-    $('input:password[id=id_imgpwd]').val(data.imgpwd);
+    $('input:text[id=id_imgpwd]').val(data.imgpwd);
-    $('input:password[id=id_efipwd]').val(data.efipwd);
+    $('input:text[id=id_efipwd]').val(data.efipwd);
-    $('input:password[id=id_vhdpwd]').val(data.vhdpwd);
+    $('input:text[id=id_vhdpwd]').val(data.vhdpwd);
-    $('input:password[id=id_vtoypwd]').val(data.vtoypwd);
+    $('input:text[id=id_vtoypwd]').val(data.vtoypwd);
   }
 
   function FillMenuPwdTable(data) {
@@ -240,13 +240,13 @@
   }
 
   function VtoyGetCurrentPageItem(data) {
-    data.bootpwd = $('input:password[id=id_bootpwd]').val();
+    data.bootpwd = $('input:text[id=id_bootpwd]').val();
-    data.isopwd = $('input:password[id=id_isopwd]').val();
+    data.isopwd = $('input:text[id=id_isopwd]').val();
-    data.wimpwd = $('input:password[id=id_wimpwd]').val();
+    data.wimpwd = $('input:text[id=id_wimpwd]').val();
-    data.imgpwd = $('input:password[id=id_imgpwd]').val();
+    data.imgpwd = $('input:text[id=id_imgpwd]').val();
-    data.efipwd = $('input:password[id=id_efipwd]').val();
+    data.efipwd = $('input:text[id=id_efipwd]').val();
-    data.vhdpwd = $('input:password[id=id_vhdpwd]').val();
+    data.vhdpwd = $('input:text[id=id_vhdpwd]').val();
-    data.vtoypwd = $('input:password[id=id_vtoypwd]').val();
+    data.vtoypwd = $('input:text[id=id_vtoypwd]').val();
   }
 
   function VtoySaveCurrentPage() {
@@ -417,7 +417,7 @@ function VtoySetPassword(common, type, cb, data) {
   });
   
   function set_common_pwd_callback(path, pwd, type, data) {
-    var selector = 'input:password[id=id_'+ data +']';
+    var selector = 'input:text[id=id_'+ data +']';
     var value = format_password(pwd, type);
 
     $(selector).val(value);
@@ -433,7 +433,7 @@ function VtoySetPassword(common, type, cb, data) {
     var id = $(this).attr('id');
 
     //id_btn_clr_
-    var selector = 'input:password[id=id_'+ id.substr(11) +']';
+    var selector = 'input:text[id=id_'+ id.substr(11) +']';
     $(selector).val('');
     VtoySaveCurrentPage();
   });
@@ -525,13 +525,13 @@ function VtoySetPassword(common, type, cb, data) {
   });
 
   function VtoySaveCurrentPage() {
-    var bootpwd = $('input:password[id=id_bootpwd]').val();
+    var bootpwd = $('input:text[id=id_bootpwd]').val();
-    var isopwd = $('input:password[id=id_isopwd]').val();
+    var isopwd = $('input:text[id=id_isopwd]').val();
-    var wimpwd = $('input:password[id=id_wimpwd]').val();
+    var wimpwd = $('input:text[id=id_wimpwd]').val();
-    var imgpwd = $('input:password[id=id_imgpwd]').val();
+    var imgpwd = $('input:text[id=id_imgpwd]').val();
-    var vhdpwd = $('input:password[id=id_vhdpwd]').val();
+    var vhdpwd = $('input:text[id=id_vhdpwd]').val();
-    var efipwd = $('input:password[id=id_efipwd]').val();
+    var efipwd = $('input:text[id=id_efipwd]').val();
-    var vtoypwd = $('input:password[id=id_vtoypwd]').val();
+    var vtoypwd = $('input:text[id=id_vtoypwd]').val();
 
     callVtoy({
       method : 'save_password',
@@ -548,13 +548,13 @@ function VtoySetPassword(common, type, cb, data) {
     });
   }
 
-  $('input:password[id=id_bootpwd]').change(VtoySaveCurrentPage);
+  $('input:text[id=id_bootpwd]').change(VtoySaveCurrentPage);
-  $('input:password[id=id_isopwd]').change(VtoySaveCurrentPage);
+  $('input:text[id=id_isopwd]').change(VtoySaveCurrentPage);
-  $('input:password[id=id_wimpwd]').change(VtoySaveCurrentPage);
+  $('input:text[id=id_wimpwd]').change(VtoySaveCurrentPage);
-  $('input:password[id=id_imgpwd]').change(VtoySaveCurrentPage);
+  $('input:text[id=id_imgpwd]').change(VtoySaveCurrentPage);
-  $('input:password[id=id_vhdpwd]').change(VtoySaveCurrentPage);
+  $('input:text[id=id_vhdpwd]').change(VtoySaveCurrentPage);
-  $('input:password[id=id_efipwd]').change(VtoySaveCurrentPage);
+  $('input:text[id=id_efipwd]').change(VtoySaveCurrentPage);
-  $('input:password[id=id_vtoypwd]').change(VtoySaveCurrentPage);
+  $('input:text[id=id_vtoypwd]').change(VtoySaveCurrentPage);
 
   $('#id_tab_password a[href="#tab_0"]').click(OnClickMultiModeTab);
   $('#id_tab_password a[href="#tab_1"]').click(OnClickMultiModeTab);

Plugson/www/plugson_theme.html

@@ -357,12 +357,7 @@
       var id = $(this).attr('id');
       if (typeof(id) != 'undefined' && id.startsWith('id_theme_file')) {
         $(this).change(function() {
-          var prelen = 'id_theme_file_radio'.length;
           m_data_theme[current_tab_index].default_file =parseInt(id.substr(id.length - 1));
-          if (id.substr(0, prelen) === 'id_theme_file_radio') {
-              m_data_theme[current_tab_index].default_file = parseInt(id.substr(prelen));
-          }
-          
           VtoySaveCurrentPage();
         });
       }

README.md

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

Unix/ventoy_unix_src/FreeBSD/geom_ventoy_src/14.x/sys/geom/ventoy/g_ventoy.h

@@ -1,147 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2020 longpanda <admin@ventoy.net>
- * Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef	_G_VENTOY_H_
-#define	_G_VENTOY_H_
-
-#include <sys/endian.h>
-
-#define	G_VENTOY_CLASS_NAME	"VENTOY"
-
-#define	G_VENTOY_MAGIC		"GEOM::VENTOY"
-/*
- * Version history:
- * 1 - Initial version number.
- * 2 - Added 'stop' command to gconcat(8).
- * 3 - Added md_provider field to metadata and '-h' option to gconcat(8).
- * 4 - Added md_provsize field to metadata.
- */
-#define	G_VENTOY_VERSION	4
-
-#ifdef _KERNEL
-#define	G_VENTOY_TYPE_MANUAL	0
-#define	G_VENTOY_TYPE_AUTOMATIC	1
-
-#define G_DEBUG(...) if (bootverbose) printf(__VA_ARGS__)
-#define G_VENTOY_DEBUG(lvl, ...) if (g_ventoy_debug) printf(__VA_ARGS__)
-#define G_VENTOY_LOGREQ(bp, ...) if (g_ventoy_debug) printf(__VA_ARGS__)
-
-struct g_ventoy_disk {
-    TAILQ_ENTRY(g_ventoy_disk) d_next;
-	struct g_consumer	*d_consumer;
-	struct g_ventoy_softc	*d_softc;
-	off_t			 d_start;
-	off_t			 d_end;
-    off_t			 d_map_start;
-    off_t			 d_map_end;
-	int			 d_candelete;
-	int			 d_removed;
-    bool			 d_hardcoded;
-};
-
-struct g_ventoy_softc {
-	u_int		 sc_type;	/* provider type */
-	struct g_geom	*sc_geom;
-	struct g_provider *sc_provider;
-	uint32_t	 sc_id;		/* concat unique ID */
-
-	uint16_t	 sc_ndisks;
-    TAILQ_HEAD(g_ventoy_disks, g_ventoy_disk) sc_disks;
-    struct mtx	 sc_completion_lock; /* synchronizes cross-boundary IOs */
-	struct sx	 sc_disks_lock; /* synchronizes modification of sc_disks */
-};
-#define	sc_name	sc_geom->name
-
-
-#pragma pack(1)
-#define VENTOY_UNIX_SEG_MAGIC0    0x11223344
-#define VENTOY_UNIX_SEG_MAGIC1    0x55667788
-#define VENTOY_UNIX_SEG_MAGIC2    0x99aabbcc
-#define VENTOY_UNIX_SEG_MAGIC3    0xddeeff00
-#define VENTOY_UNIX_MAX_SEGNUM   40960
-struct g_ventoy_seg {
-    uint64_t seg_start_bytes;
-    uint64_t seg_end_bytes;
-};
-
-struct g_ventoy_map{
-    uint32_t magic1[4];
-    uint32_t magic2[4];
-    uint64_t segnum;
-    uint64_t disksize;
-    uint8_t diskuuid[16];
-    struct g_ventoy_seg seglist[VENTOY_UNIX_MAX_SEGNUM];
-    uint32_t magic3[4];
-};
-#pragma pack()
-
-#define VENTOY_MAP_VALID(magic2) \
-    (magic2[0] == VENTOY_UNIX_SEG_MAGIC0 && magic2[1] == VENTOY_UNIX_SEG_MAGIC1 && magic2[2] == VENTOY_UNIX_SEG_MAGIC2 && magic2[3] == VENTOY_UNIX_SEG_MAGIC3)
-
-#endif	/* _KERNEL */
-
-struct g_ventoy_metadata {
-	char		md_magic[16];	/* Magic value. */
-	uint32_t	md_version;	/* Version number. */
-	char		md_name[16];	/* Concat name. */
-	uint32_t	md_id;		/* Unique ID. */
-	uint16_t	md_no;		/* Disk number. */
-	uint16_t	md_all;		/* Number of all disks. */
-	char		md_provider[16]; /* Hardcoded provider. */
-	uint64_t	md_provsize;	/* Provider's size. */
-};
-static __inline void
-ventoy_metadata_encode(const struct g_ventoy_metadata *md, u_char *data)
-{
-
-	bcopy(md->md_magic, data, sizeof(md->md_magic));
-	le32enc(data + 16, md->md_version);
-	bcopy(md->md_name, data + 20, sizeof(md->md_name));
-	le32enc(data + 36, md->md_id);
-	le16enc(data + 40, md->md_no);
-	le16enc(data + 42, md->md_all);
-	bcopy(md->md_provider, data + 44, sizeof(md->md_provider));
-	le64enc(data + 60, md->md_provsize);
-}
-static __inline void
-ventoy_metadata_decode(const u_char *data, struct g_ventoy_metadata *md)
-{
-
-	bcopy(data, md->md_magic, sizeof(md->md_magic));
-	md->md_version = le32dec(data + 16);
-	bcopy(data + 20, md->md_name, sizeof(md->md_name));
-	md->md_id = le32dec(data + 36);
-	md->md_no = le16dec(data + 40);
-	md->md_all = le16dec(data + 42);
-	bcopy(data + 44, md->md_provider, sizeof(md->md_provider));
-	md->md_provsize = le64dec(data + 60);
-}
-#endif	/* _G_VENTOY_H_ */

Unix/ventoy_unix_src/FreeBSD/geom_ventoy_src/14.x/sys/modules/geom/geom_ventoy/Makefile

@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${SRCTOP}/sys/geom/ventoy
-
-KMOD=	geom_ventoy
-SRCS=	g_ventoy.c
-
-.include <bsd.kmod.mk>

Ventoy2Disk/Ventoy2Disk/ff14/source/diskio.h

@@ -40,7 +40,7 @@ DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff);
 #define STA_PROTECT		0x04	/* Write protected */
 
 
-/* Command code for disk_ioctrl function */
+/* Command code for disk_ioctrl fucntion */
 
 /* Generic command (Used by FatFs) */
 #define CTRL_SYNC			0	/* Complete pending write process (needed at FF_FS_READONLY == 0) */

VtoyTool/vtoykmod.c

@@ -164,13 +164,6 @@ struct modversion_info {
 	char name[64 - sizeof(unsigned long)];
 };
 
-struct modversion_info2 {
-	/* Offset of the next modversion entry in relation to this one. */
-	uint32_t next;
-	uint32_t crc;
-	char name[0];
-};
-
 
 typedef struct ko_param
 {
@@ -188,12 +181,6 @@ typedef struct ko_param
     unsigned long sym_put_size;
     unsigned long kv_major;
     unsigned long ibt;
-    unsigned long kv_minor;
-    unsigned long blkdev_get_addr;
-    unsigned long blkdev_put_addr;
-    unsigned long bdev_open_addr;
-    unsigned long kv_subminor;
-    unsigned long bdev_file_open_addr;
     unsigned long padding[1];
 }ko_param;
 
@@ -249,7 +236,7 @@ static int vtoykmod_read_file(char *name, char **buf)
     return size;
 }
 
-static int vtoykmod_find_section64(char *buf, char *section, int *offset, int *len, Elf64_Shdr **shdr)
+static int vtoykmod_find_section64(char *buf, char *section, int *offset, int *len)
 {
     uint16_t i;
     int cmplen;
@@ -271,10 +258,6 @@ static int vtoykmod_find_section64(char *buf, char *section, int *offset, int *l
         {
             *offset = (int)(sec[i].sh_offset);
             *len = (int)(sec[i].sh_size);
-            if (shdr)
-            {
-                *shdr = sec + i;
-            }
             return 0;
         }
     }
@@ -282,7 +265,7 @@ static int vtoykmod_find_section64(char *buf, char *section, int *offset, int *l
     return 1;
 }
 
-static int vtoykmod_find_section32(char *buf, char *section, int *offset, int *len, Elf32_Shdr **shdr)
+static int vtoykmod_find_section32(char *buf, char *section, int *offset, int *len)
 {
     uint16_t i;
     int cmplen;
@@ -304,10 +287,6 @@ static int vtoykmod_find_section32(char *buf, char *section, int *offset, int *l
         {
             *offset = (int)(sec[i].sh_offset);
             *len = (int)(sec[i].sh_size);
-            if (shdr)
-            {
-                *shdr = sec + i;
-            }
             return 0;
         }
     }
@@ -315,7 +294,7 @@ static int vtoykmod_find_section32(char *buf, char *section, int *offset, int *l
     return 1;
 }
 
-static int vtoykmod_update_modcrc1(char *oldmodver, int oldcnt, char *newmodver, int newcnt)
+static int vtoykmod_update_modcrc(char *oldmodver, int oldcnt, char *newmodver, int newcnt)
 {
     int i, j;
     struct modversion_info *pold, *pnew;
@@ -323,7 +302,6 @@ static int vtoykmod_update_modcrc1(char *oldmodver, int oldcnt, char *newmodver,
     pold = (struct modversion_info *)oldmodver;
     pnew = (struct modversion_info *)newmodver;
 
-    debug("module update modver format 1\n");
     for (i = 0; i < oldcnt; i++)
     {
         for (j = 0; j < newcnt; j++)
@@ -340,51 +318,6 @@ static int vtoykmod_update_modcrc1(char *oldmodver, int oldcnt, char *newmodver,
     return 0;
 }
 
-
-static int vtoykmod_update_modcrc2(char *oldmodver, int oldlen, char *newmodver, int newlen)
-{
-    struct modversion_info2 *pold, *pnew, *pnewend;
-
-    pold = (struct modversion_info2 *)oldmodver;
-    pnew = (struct modversion_info2 *)newmodver;
-    pnewend = (struct modversion_info2 *)(newmodver + newlen);
-
-    debug("module update modver format 2\n");
-    /* here we think that there is only module_layout in oldmodver */
-
-    for (; pnew < pnewend && pnew->next; pnew = (struct modversion_info2 *)((char *)pnew + pnew->next))
-    {
-	    if (strcmp(pnew->name, "module_layout") == 0)
-        {
-            debug("CRC  0x%08x --> 0x%08x  %s\n", pold->crc, pnew->crc, pnew->name);
-            memset(pold, 0, oldlen);
-            pold->next = 0x18;  /* 8 + module_layout align 8 */
-            pold->crc = pnew->crc;
-            strcpy(pold->name, pnew->name);
-            break;
-        }
-    }
-
-    return 0;
-}
-
-
-static int vtoykmod_update_modcrc(char *oldmodver, int oldlen, char *newmodver, int newlen)
-{
-    uint32_t uiCrc = 0;
-
-    memcpy(&uiCrc, newmodver + 4, 4);
-
-    if (uiCrc > 0)
-    {
-        return vtoykmod_update_modcrc2(oldmodver, oldlen, newmodver, newlen);
-    }
-    else
-    {
-        return vtoykmod_update_modcrc1(oldmodver, oldlen / 64, newmodver, newlen / 64);
-    }
-}
-
 static int vtoykmod_update_vermagic(char *oldbuf, int oldsize, char *newbuf, int newsize, int *modver)
 {
     int i = 0;
@@ -425,7 +358,7 @@ static int vtoykmod_update_vermagic(char *oldbuf, int oldsize, char *newbuf, int
     return 0;
 }
 
-int vtoykmod_update(int kvMajor, int kvMinor, char *oldko, char *newko)
+int vtoykmod_update(char *oldko, char *newko)
 {
     int rc = 0;
     int modver = 0;
@@ -433,7 +366,6 @@ int vtoykmod_update(int kvMajor, int kvMinor, char *oldko, char *newko)
     int newoff, newlen;
     int oldsize, newsize;
     char *newbuf, *oldbuf;
-    Elf64_Shdr *sec = NULL;
 
     oldsize = vtoykmod_read_file(oldko, &oldbuf);
     newsize = vtoykmod_read_file(newko, &newbuf);
@@ -450,18 +382,18 @@ int vtoykmod_update(int kvMajor, int kvMinor, char *oldko, char *newko)
     {
         if (oldbuf[EI_CLASS] == ELFCLASS64)
         {
-            rc  = vtoykmod_find_section64(oldbuf, "__versions", &oldoff, &oldlen, NULL);
+            rc  = vtoykmod_find_section64(oldbuf, "__versions", &oldoff, &oldlen);
-            rc += vtoykmod_find_section64(newbuf, "__versions", &newoff, &newlen, NULL);            
+            rc += vtoykmod_find_section64(newbuf, "__versions", &newoff, &newlen);            
         }
         else
         {
-            rc  = vtoykmod_find_section32(oldbuf, "__versions", &oldoff, &oldlen, NULL);
+            rc  = vtoykmod_find_section32(oldbuf, "__versions", &oldoff, &oldlen);
-            rc += vtoykmod_find_section32(newbuf, "__versions", &newoff, &newlen, NULL);
+            rc += vtoykmod_find_section32(newbuf, "__versions", &newoff, &newlen);
         }
 
         if (rc == 0)
         {
-            vtoykmod_update_modcrc(oldbuf + oldoff, oldlen, newbuf + newoff, newlen);
+            vtoykmod_update_modcrc(oldbuf + oldoff, oldlen / 64, newbuf + newoff, newlen / 64);
         }
     }
     else
@@ -474,8 +406,8 @@ int vtoykmod_update(int kvMajor, int kvMinor, char *oldko, char *newko)
     {
         Elf64_Rela *oldRela, *newRela;
         
-        rc  = vtoykmod_find_section64(oldbuf, ".rela.gnu.linkonce.this_module", &oldoff, &oldlen, NULL);
+        rc  = vtoykmod_find_section64(oldbuf, ".rela.gnu.linkonce.this_module", &oldoff, &oldlen);
-        rc += vtoykmod_find_section64(newbuf, ".rela.gnu.linkonce.this_module", &newoff, &newlen, NULL);
+        rc += vtoykmod_find_section64(newbuf, ".rela.gnu.linkonce.this_module", &newoff, &newlen);
         if (rc == 0)
         {
             oldRela = (Elf64_Rela *)(oldbuf + oldoff);
@@ -493,31 +425,13 @@ int vtoykmod_update(int kvMajor, int kvMinor, char *oldko, char *newko)
         {
             debug("section .rela.gnu.linkonce.this_module not found\n");
         }
-
-        if (kvMajor > 6 || (kvMajor == 6 && kvMinor >= 3))
-        {
-            rc  = vtoykmod_find_section64(oldbuf, ".gnu.linkonce.this_module", &oldoff, &oldlen, &sec);
-            rc += vtoykmod_find_section64(newbuf, ".gnu.linkonce.this_module", &newoff, &newlen, NULL);
-            if (rc == 0)
-            {
-                debug("section .gnu.linkonce.this_module change oldlen:0x%x to newlen:0x%x\n", oldlen, newlen);
-                if (sec)
-                {
-                    sec->sh_size = newlen;                
-                }
-            }
-            else
-            {
-                debug("section .gnu.linkonce.this_module not found\n");
-            }
-        }
     }
     else
     {
         Elf32_Rel *oldRel, *newRel;
         
-        rc  = vtoykmod_find_section32(oldbuf, ".rel.gnu.linkonce.this_module", &oldoff, &oldlen, NULL);
+        rc  = vtoykmod_find_section32(oldbuf, ".rel.gnu.linkonce.this_module", &oldoff, &oldlen);
-        rc += vtoykmod_find_section32(newbuf, ".rel.gnu.linkonce.this_module", &newoff, &newlen, NULL);
+        rc += vtoykmod_find_section32(newbuf, ".rel.gnu.linkonce.this_module", &newoff, &newlen);
         if (rc == 0)
         {
             oldRel = (Elf32_Rel *)(oldbuf + oldoff);
@@ -575,14 +489,8 @@ int vtoykmod_fill_param(char **argv)
             param->sym_put_size = strtoul(argv[8], NULL, 10);
             param->reg_kprobe_addr = strtoul(argv[9], NULL, 16);
             param->unreg_kprobe_addr = strtoul(argv[10], NULL, 16);
-            param->kv_major = strtoul(argv[11], NULL, 10);
+            param->kv_major = (unsigned long)(argv[11][0] - '0');
             param->ibt = strtoul(argv[12], NULL, 16);;
-            param->kv_minor = strtoul(argv[13], NULL, 10);
-            param->blkdev_get_addr = strtoul(argv[14], NULL, 16);
-            param->blkdev_put_addr = strtoul(argv[15], NULL, 16);
-            param->kv_subminor = strtoul(argv[16], NULL, 10);
-            param->bdev_open_addr = strtoul(argv[17], NULL, 16);
-            param->bdev_file_open_addr = strtoul(argv[18], NULL, 16);
 
             debug("pgsize=%lu (%s)\n", param->pgsize, argv[1]);
             debug("printk_addr=0x%lx (%s)\n", param->printk_addr, argv[2]);
@@ -596,12 +504,6 @@ int vtoykmod_fill_param(char **argv)
             debug("unreg_kprobe_addr=0x%lx (%s)\n", param->unreg_kprobe_addr, argv[10]);
             debug("kv_major=%lu (%s)\n", param->kv_major, argv[11]);
             debug("ibt=0x%lx (%s)\n", param->ibt, argv[12]);
-            debug("kv_minor=%lu (%s)\n", param->kv_minor, argv[13]);
-            debug("blkdev_get_addr=0x%lx (%s)\n", param->blkdev_get_addr, argv[14]);
-            debug("blkdev_put_addr=0x%lx (%s)\n", param->blkdev_put_addr, argv[15]);
-            debug("kv_subminor=%lu (%s)\n", param->kv_subminor, argv[16]);
-            debug("bdev_open_addr=0x%lx (%s)\n", param->bdev_open_addr, argv[17]);
-            debug("bdev_file_open_addr=0x%lx (%s)\n", param->bdev_file_open_addr, argv[18]);
             
             break;
         }
@@ -641,8 +543,6 @@ static int vtoykmod_check_ibt(void)
 int vtoykmod_main(int argc, char **argv)
 {
     int i;
-    int kvMajor = 0;
-    int kvMinor = 0;
 
     for (i = 0; i < argc; i++)
     {
@@ -653,25 +553,13 @@ int vtoykmod_main(int argc, char **argv)
         }
     }
 
-    if (verbose)
-    {
-        printf("==== Dump Argv ====\n");
-        for (i = 0; i < argc; i++)
-        {
-            printf("<%s> ", argv[i]);
-        }
-        printf("\n");
-    }
-
     if (argv[1][0] == '-' && argv[1][1] == 'f')
     {
         return vtoykmod_fill_param(argv + 2);
     }
     else if (argv[1][0] == '-' && argv[1][1] == 'u')
     {
-        kvMajor = (int)strtol(argv[2], NULL, 10);
+        return vtoykmod_update(argv[2], argv[3]);
-        kvMinor = (int)strtol(argv[3], NULL, 10);
-        return vtoykmod_update(kvMajor, kvMinor, argv[4], argv[5]);
     }
     else if (argv[1][0] == '-' && argv[1][1] == 'I')
     {

VtoyTool/vtoyksym.c

@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <errno.h>
 #include <unistd.h>
 
@@ -31,12 +30,10 @@ static int verbose = 0;
 int vtoyksym_main(int argc, char **argv)
 {
     int i;
-    int len = 0;
     unsigned long long addr1 = 0;
     unsigned long long addr2 = 0;
     char sym[256];
     char line[1024];
-    char *start = NULL;
     const char *name = NULL;
     FILE *fp;
 
@@ -71,11 +68,9 @@ int vtoyksym_main(int argc, char **argv)
     snprintf(sym, sizeof(sym), " %s", argv[1]);
     debug("lookup for <%s>\n", sym);
 
-    len = (int)strlen(sym);
     while (fgets(line, sizeof(line), fp))
     {
-        start = strstr(line, sym);
+        if (strstr(line, sym))
-        if (start && (start > line) && isspace(*(start + len)))
         {
             addr1 = strtoull(line, NULL, 16);
             if (!fgets(line, sizeof(line), fp))