1.0.34 release

.github/workflows/ci.yml

@@ -5,6 +5,8 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+  
+  workflow_dispatch:
 
 jobs:
   build:
@@ -13,12 +15,19 @@ jobs:
     - uses: actions/checkout@v2
     - name: Run docker-compose up
       run: docker-compose up
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ventoy-windows
+        path: INSTALL/ventoy-*windows*
     - uses: actions/upload-artifact@v2
       with:
         name: ventoy-linux
         path: INSTALL/ventoy-*linux*
     - uses: actions/upload-artifact@v2
       with:
-        name: ventoy-windows
-        path: INSTALL/ventoy-*windows*
-
+        name: ventoy-livecd
+        path: INSTALL/ventoy-*livecd*
+    - uses: actions/upload-artifact@v2
+      with:
+        name: xxx-build-log
+        path: DOC/build.log

.github/workflows/sync2gitee.yml

@@ -0,0 +1,26 @@
+name: Mirror GitHub to Gitee
+
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  run:
+    name: Sync-GitHub-to-Gitee
+    runs-on: ubuntu-latest
+    steps:
+    - name: Mirror the Github repos to Gitee.
+      uses: Yikun/hub-mirror-action@master
+      with:
+        src: github/ventoy
+        dst: gitee/LongPanda
+        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+        dst_token: ${{ secrets.GITEE_TOKEN }}
+        static_list: "Ventoy"
+        force_update: true

DOC/BuildVentoyFromSource.txt

@@ -3,7 +3,7 @@
 1. Compile Enviroment
 ==========================================
     My build envrioment is CentOS 7.8 x86_64. So here I first explain how to create the build environment from scratch.
-    Because Ventoy is based on many open source projects, so the environment is important. I suggest you test it on a virtual machine first.
+    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
@@ -14,7 +14,7 @@
         mpfr.i686 mpfr-devel.i686 zlib.i686 rsync autogen autoconf automake libtool gettext* bison binutils \
         flex device-mapper-devel SDL libpciaccess libusb freetype freetype-devel gnu-free-* qemu-* virt-* \
         libvirt* vte* NetworkManager-bluetooth brlapi fuse-devel dejavu* gnu-efi* pesign shim \
-        iscsi-initiator-utils grub2-tools zip nasm acpica-tools glibc-static zlib-static
+        iscsi-initiator-utils grub2-tools zip nasm acpica-tools glibc-static zlib-static xorriso
     
 
 
@@ -22,9 +22,9 @@
 2. Download Source Code
 ==========================================
 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 level).
+    Next I assume that you have unzipped the code into the /home directory (check /home/Ventoy-master/README.md file for the directory layout).
     
-2.2 Download third-part source code
+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
@@ -35,6 +35,17 @@
     https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/aarch64-linux-gnu/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz           ===>  /opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz
     https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2020.08-1.tar.bz2 ===> /opt/aarch64--uclibc--stable-2020.08-1.tar.bz2
 
+    http://www.tinycorelinux.net/11.x/x86_64/release/distribution_files/vmlinuz64 ===> /home/Ventoy-master/LiveCD/ISO/EFI/boot/vmlinuz64
+    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
+    http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/glib2.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/glib2.tcz
+    http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/libffi.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/libffi.tcz
+    http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/liblvm2.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/liblvm2.tcz
+    http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/ncursesw.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/ncursesw.tcz
+    http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/parted.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/parted.tcz
+    http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/readline.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/readline.tcz
+    http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/udev-lib.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/udev-lib.tcz
+
 2.3 Prepare third-part tools
     cd /home/Ventoy-master/DOC/
     tar xf musl-1.2.1.tar.gz
@@ -52,20 +63,22 @@
 ==========================================
 3. All in one script
 ==========================================
-    I have made the whole build process in 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, some part of Ventoy has 32bit&64bit version (like 4.9 4.10 4.11 follows)
-    all_in_one.sh only build 64bit version of them, if you want to rebuild the 32bit verison. You should create a 32bit CentOS environment and build them.
-    Fortunately these parts are few modified, you only need to build once or you can directly use the binary I have built.
+    It should be noted that:
+    1. Only grub2/EDK2/IPXE will be recompiled in all_in_one.sh. Other part contains the binaries and are few modified, so will no be recompiled everytime.
+       You can rebuild these parts separately if you want.
+       
+    2. some part of Ventoy has 32bit&64bit version (like 4.9 4.10 4.11 follows)
+       all_in_one.sh only build 64bit version of them, if you want to rebuild the 32bit verison. You should create a 32bit CentOS environment and build them.
+       Fortunately these parts are few modified, you only need to build once or you can directly use the binary I have built.
 
     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
 ==========================================

DOC/prepare_env.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+#[ -d /opt/diet64 ] || sh ./installdietlibc.sh
+
+[ -d /opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu ] || tar xf /opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz  -C /opt
+
+[ -d /opt/aarch64--uclibc--stable-2020.08-1 ] || tar xf /opt/aarch64--uclibc--stable-2020.08-1.tar.bz2  -C /opt
+

Dockerfile

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

EDK2/build.sh

@@ -33,12 +33,11 @@ rm -f $DST_PATH
 rm -f $VTEFI_PATH2
 rm -f $DST_PATH2
 rm -f $VTEFI_PATH3
-rm -f $DST_PATH3
+[ -d ../../VDiskChain ] && rm -f $DST_PATH3
 
 source ./edksetup.sh
 
 if [ "$EDKARCH" = "AARCH64" ]; then    
-    PATH=$PATH:/opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu/bin \
     GCC48_AARCH64_PREFIX=aarch64-linux-gnu- \
     build -p MdeModulePkg/MdeModulePkg.dsc -a $EDKARCH -b RELEASE -t GCC48
 else
@@ -49,7 +48,7 @@ if [ -e $VTEFI_PATH ] && [ -e $VTEFI_PATH2 ] && [ -e $VTEFI_PATH3 ]; then
     echo -e '\n\n====================== SUCCESS ========================\n\n'    
     cp -a $VTEFI_PATH $DST_PATH
     cp -a $VTEFI_PATH2 $DST_PATH2
-    cp -a $VTEFI_PATH3 $DST_PATH3
+    [ -d ../../VDiskChain ] && cp -a $VTEFI_PATH3 $DST_PATH3
     cd ..
 else
     echo -e '\n\n====================== FAILED ========================\n\n'

EDK2/buildedk.sh

@@ -7,34 +7,15 @@ unzip edk2-edk2-stable201911.zip
 /bin/cp -a ./edk2_mod/edk2-edk2-stable201911  ./
 
 cd edk2-edk2-stable201911
-
-VTEFI_PATH=Build/MdeModule/RELEASE_GCC48/X64/MdeModulePkg/Application/Ventoy/Ventoy/OUTPUT/Ventoy.efi
-DST_PATH=../../INSTALL/ventoy/ventoy_x64.efi
-
-VTEFI_PATH2=Build/MdeModule/RELEASE_GCC48/IA32/MdeModulePkg/Application/Ventoy/Ventoy/OUTPUT/Ventoy.efi
-DST_PATH2=../../INSTALL/ventoy/ventoy_ia32.efi
-
-rm -f $VTEFI_PATH
-rm -f $DST_PATH
-rm -f $VTEFI_PATH2
-rm -f $DST_PATH2
-
 make -j 4 -C BaseTools/
+cd ..
 
-source ./edksetup.sh
-build -p MdeModulePkg/MdeModulePkg.dsc -a  X64 -b RELEASE -t GCC48
-build -p MdeModulePkg/MdeModulePkg.dsc -a IA32 -b RELEASE -t GCC48
-
-if [ -e $VTEFI_PATH ] && [ -e $VTEFI_PATH2 ]; then
-    echo -e '\n\n====================== SUCCESS ========================\n\n'    
-    cp -a $VTEFI_PATH  $DST_PATH
-    cp -a $VTEFI_PATH2 $DST_PATH2
-    cd ..
-else
-    echo -e '\n\n====================== FAILED ========================\n\n'
-    cd ..
-    exit 1
-fi
+echo '======== build EDK2 for i386-efi ==============='
+sh ./build.sh ia32 || exit 1
 
+echo '======== build EDK2 for arm64-efi ==============='
+sh ./build.sh aa64 || exit 1
 
+echo '======== build EDK2 for x86_64-efi ==============='
+sh ./build.sh      || exit 1
 

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

@@ -71,7 +71,10 @@ CONST CHAR16 *gEfiBootFileName[] =
 
 UINT8 *g_disk_buf_addr = NULL;
 UINT64 g_disk_buf_size = 0;
-        
+
+STATIC EFI_GET_VARIABLE g_org_get_variable = NULL;
+STATIC EFI_EXIT_BOOT_SERVICES g_org_exit_boot_service = NULL;
+
 VOID EFIAPI VDiskDebug(IN CONST CHAR8  *Format, ...)
 {
     VA_LIST  Marker;
@@ -217,6 +220,54 @@ STATIC EFI_STATUS vdisk_patch_vdisk_path(CHAR16 *pos)
     return 0;    
 }
 
+EFI_STATUS EFIAPI vdisk_get_variable_wrapper
+(
+    IN     CHAR16                      *VariableName,
+    IN     EFI_GUID                    *VendorGuid,
+    OUT    UINT32                      *Attributes,    OPTIONAL
+    IN OUT UINTN                       *DataSize,
+    OUT    VOID                        *Data           OPTIONAL
+)
+{
+    EFI_STATUS Status = EFI_SUCCESS;
+    
+    Status = g_org_get_variable(VariableName, VendorGuid, Attributes, DataSize, Data);
+    if (StrCmp(VariableName, L"SecureBoot") == 0)
+    {
+        if ((*DataSize == 1) && Data)
+        {
+            *(UINT8 *)Data = 0;
+        }
+    }
+
+    return Status;
+}
+
+EFI_STATUS EFIAPI vdisk_exit_boot_service_wrapper
+(
+    IN  EFI_HANDLE                   ImageHandle,
+    IN  UINTN                        MapKey
+)
+{
+    return g_org_exit_boot_service(ImageHandle, MapKey);
+}
+
+STATIC EFI_STATUS EFIAPI vdisk_disable_secure_boot(IN EFI_HANDLE ImageHandle)
+{
+    /* step1: wrapper security protocol. */
+    /* Do we still need it since we have been loaded ? */
+    
+    
+    /* step2: fake SecureBoot variable */
+    g_org_exit_boot_service = gBS->ExitBootServices;
+    gBS->ExitBootServices = vdisk_exit_boot_service_wrapper;
+    
+    g_org_get_variable = gRT->GetVariable;
+    gRT->GetVariable = vdisk_get_variable_wrapper;
+
+    return EFI_SUCCESS;
+}
+
 STATIC EFI_STATUS EFIAPI vdisk_parse_cmdline(IN EFI_HANDLE ImageHandle)
 {   
     CHAR16 *Pos = NULL;
@@ -254,6 +305,11 @@ STATIC EFI_STATUS EFIAPI vdisk_parse_cmdline(IN EFI_HANDLE ImageHandle)
 
     vdisk_patch_vdisk_path(Pos + 6);
 
+    if (StrStr(pCmdLine, L"secureboot=off"))
+    {
+        vdisk_disable_secure_boot(ImageHandle);
+    }
+
     FreePool(pCmdLine);
     return EFI_SUCCESS;
 }

EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VDiskChain/VDiskRawData.c

@@ -1 +1,2 @@
-123
+#include <Uefi.h>
+int vdisk_get_vdisk_raw(UINT8 **buf, UINT32 *size) { *buf = NULL; *size = 0; return 0; }

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

@@ -534,6 +534,26 @@ static grub_err_t ventoy_cmd_incr(grub_extcmd_context_t ctxt, int argc, char **a
     VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
 
+static grub_err_t ventoy_cmd_mod(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    long value1 = 0;
+    long value2 = 0;
+    char buf[32];
+    
+    if (argc != 3)
+    {
+        return grub_error(GRUB_ERR_BAD_ARGUMENT, "Usage: %s {Int} {Int} {Variable}", cmd_raw_name);
+    }
+
+    value1 = grub_strtol(args[0], NULL, 10);
+    value2 = grub_strtol(args[1], NULL, 10);
+
+    grub_snprintf(buf, sizeof(buf), "%ld", (value1 % value2));
+    grub_env_set(args[2], buf);
+
+    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
+}
+
 static grub_err_t ventoy_cmd_file_size(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     int rc = 1;
@@ -1031,7 +1051,7 @@ int ventoy_cmp_img(img_info *img1, img_info *img2)
     int c1 = 0;
     int c2 = 0;
 
-    if (g_plugin_image_list)
+    if (g_plugin_image_list == VENTOY_IMG_WHITE_LIST)
     {
         return (img1->plugin_list_index - img2->plugin_list_index);
     }
@@ -1069,7 +1089,7 @@ static int ventoy_cmp_subdir(img_iterator_node *node1, img_iterator_node *node2)
     int c1 = 0;
     int c2 = 0;
 
-    if (g_plugin_image_list)
+    if (g_plugin_image_list == VENTOY_IMG_WHITE_LIST)
     {
         return (node1->plugin_list_index - node2->plugin_list_index);
     }
@@ -1140,7 +1160,7 @@ static int ventoy_check_ignore_flag(const char *filename, const struct grub_dirh
     return 0;
 }
 
-static int ventoy_colect_img_files(const char *filename, const struct grub_dirhook_info *info, void *data)
+static int ventoy_collect_img_files(const char *filename, const struct grub_dirhook_info *info, void *data)
 {
     //int i = 0;
     int type = 0;
@@ -1173,7 +1193,7 @@ static int ventoy_colect_img_files(const char *filename, const struct grub_dirho
             return 0;
         }
 
-        if (g_plugin_image_list)
+        if (g_plugin_image_list == VENTOY_IMG_WHITE_LIST)
         {
             grub_snprintf(g_img_swap_tmp_buf, sizeof(g_img_swap_tmp_buf), "%s%s/", node->dir, filename);
             index = ventoy_plugin_get_image_list_index(vtoy_class_directory, g_img_swap_tmp_buf);
@@ -1261,6 +1281,15 @@ static int ventoy_colect_img_files(const char *filename, const struct grub_dirho
         {
             type = img_type_vtoy;
         }
+        else if (len >= 9 && 0 == grub_strcasecmp(filename + len - 5, ".vcfg"))
+        {
+            if (filename[len - 9] == '.' || (len >= 10 && filename[len - 10] == '.'))
+            {
+                grub_snprintf(g_img_swap_tmp_buf, sizeof(g_img_swap_tmp_buf), "%s%s", node->dir, filename);
+                ventoy_plugin_add_custom_boot(g_img_swap_tmp_buf);
+            }
+            return 0;
+        }
         else
         {
             return 0;
@@ -1275,11 +1304,16 @@ static int ventoy_colect_img_files(const char *filename, const struct grub_dirho
         {
             grub_snprintf(g_img_swap_tmp_buf, sizeof(g_img_swap_tmp_buf), "%s%s", node->dir, filename);
             index = ventoy_plugin_get_image_list_index(vtoy_class_image_file, g_img_swap_tmp_buf);
-            if (index == 0)
+            if (VENTOY_IMG_WHITE_LIST == g_plugin_image_list && index == 0)
             {
                 debug("File %s not found in image_list plugin config...\n", g_img_swap_tmp_buf);
                 return 0; 
             }
+            else if (VENTOY_IMG_BLACK_LIST == g_plugin_image_list && index > 0)
+            {
+                debug("File %s found in image_blacklist plugin config...\n", g_img_swap_tmp_buf);
+                return 0; 
+            }
         }
         
         img = grub_zalloc(sizeof(img_info));
@@ -2002,7 +2036,7 @@ static grub_err_t ventoy_cmd_list_img(grub_extcmd_context_t ctxt, int argc, char
 
     for (node = &g_img_iterator_head; node; node = node->next)
     {
-        fs->fs_dir(dev, node->dir, ventoy_colect_img_files, node);        
+        fs->fs_dir(dev, node->dir, ventoy_collect_img_files, node);        
     }
 
     strdata = ventoy_get_env("VTOY_TREE_VIEW_MENU_STYLE");
@@ -2261,6 +2295,7 @@ int ventoy_has_efi_eltorito(grub_file_t file, grub_uint32_t sector)
     int i;
     int x86count = 0;
     grub_uint8_t buf[512];
+    grub_uint8_t parttype[] = { 0x04, 0x06, 0x0B, 0x0C };
 
     grub_file_seek(file, sector * 2048);
     grub_file_read(file, buf, sizeof(buf));
@@ -2291,6 +2326,18 @@ int ventoy_has_efi_eltorito(grub_file_t file, grub_uint32_t sector)
         }
     }
 
+    if (x86count && buf[32] == 0x88 && buf[33] == 0x04)
+    {
+        for (i = 0; i < (int)(ARRAY_SIZE(parttype)); i++)
+        {
+            if (buf[36] == parttype[i])
+            {
+                debug("hard disk image assume %s efi eltorito, part type 0x%x\n", file->name, buf[36]);
+                return 1;
+            }
+        }
+    }
+
     debug("%s does not contain efi eltorito\n", file->name);
     return 0;
 }
@@ -3218,14 +3265,15 @@ static grub_err_t ventoy_cmd_parse_volume(grub_extcmd_context_t ctxt, int argc,
     int len;
     grub_file_t file;
     char buf[64];
+    grub_uint64_t size;
     ventoy_iso9660_vd pvd;
         
     (void)ctxt;
     (void)argc;
 
-    if (argc != 3)
+    if (argc != 4)
     {
-        return grub_error(GRUB_ERR_BAD_ARGUMENT, "Usage: %s sysid volid \n", cmd_raw_name); 
+        return grub_error(GRUB_ERR_BAD_ARGUMENT, "Usage: %s sysid volid space \n", cmd_raw_name); 
     }
 
     file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s", args[0]);
@@ -3251,6 +3299,11 @@ static grub_err_t ventoy_cmd_parse_volume(grub_extcmd_context_t ctxt, int argc,
     grub_memcpy(buf, pvd.vol, sizeof(pvd.vol));
     ventoy_set_env(args[2], buf);
 
+    size = pvd.space;
+    size *= 2048;
+    grub_snprintf(buf, sizeof(buf), "%llu", (ulonglong)size);
+    ventoy_set_env(args[3], buf);
+    
 end:
     grub_file_close(file);
     
@@ -3593,6 +3646,31 @@ static grub_err_t ventoy_cmd_load_part_table(grub_extcmd_context_t ctxt, int arg
     return 0;
 }
 
+static grub_err_t ventoy_cmd_check_custom_boot(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    int ret = 1;
+    const char *vcfg = NULL;
+
+    (void)argc;
+    (void)ctxt;
+
+    vcfg = ventoy_plugin_get_custom_boot(args[0]);
+    if (vcfg)
+    {
+        debug("custom boot <%s>:<%s>\n", args[0], vcfg);
+        grub_env_set(args[1], vcfg);
+        ret = 0;
+    }
+    else
+    {
+        debug("custom boot <%s>:<NOT FOUND>\n", args[0]);
+    }
+
+    grub_errno = 0;
+    return ret;
+}
+
+
 static grub_err_t ventoy_cmd_part_exist(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     int id;
@@ -3785,6 +3863,36 @@ static grub_err_t ventoy_cmd_basename(grub_extcmd_context_t ctxt, int argc, char
     return 0;
 }
 
+static grub_err_t ventoy_cmd_basefile(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    int i;
+    int len;
+    const char *buf;
+    
+    (void)ctxt;
+
+    if (argc != 2)
+    {
+        debug("ventoy_cmd_basefile, invalid param num %d\n", argc);
+        return 1;
+    }
+
+    buf = args[0];
+    len = (int)grub_strlen(buf);
+    for (i = len; i > 0; i--)
+    {
+        if (buf[i - 1] == '/')
+        {
+            grub_env_set(args[1], buf + i);
+            return 0;
+        }
+    }
+
+    grub_env_set(args[1], buf);
+
+    return 0;
+}
+
 static grub_err_t ventoy_cmd_enum_video_mode(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     struct grub_video_mode_info info;
@@ -4032,6 +4140,7 @@ static int ventoy_env_init(void)
 static cmd_para ventoy_cmds[] = 
 {
     { "vt_incr",  ventoy_cmd_incr,  0, NULL, "{Var} {INT}",   "Increase integer variable",    NULL },
+    { "vt_mod",  ventoy_cmd_mod,  0, NULL, "{Int} {Int} {Var}",   "mod integer variable",    NULL },
     { "vt_strstr",  ventoy_cmd_strstr,  0, NULL, "",   "",    NULL },
     { "vt_str_begin",  ventoy_cmd_strbegin,  0, NULL, "",   "",    NULL },
     { "vt_debug", ventoy_cmd_debug, 0, NULL, "{on|off}",   "turn debug on/off",    NULL },
@@ -4051,6 +4160,8 @@ static cmd_para ventoy_cmds[] =
     { "vt_patch_vhdboot", ventoy_cmd_patch_vhdboot, 0, NULL, "", "", NULL },
     { "vt_raw_chain_data", ventoy_cmd_raw_chain_data, 0, NULL, "", "", NULL },
     { "vt_get_vtoy_type", ventoy_cmd_get_vtoy_type, 0, NULL, "", "", NULL },
+    { "vt_check_custom_boot", ventoy_cmd_check_custom_boot, 0, NULL, "", "", NULL },
+    { "vt_dump_custom_boot", ventoy_cmd_dump_custom_boot, 0, NULL, "", "", NULL },
 
     { "vt_skip_svd", ventoy_cmd_skip_svd, 0, NULL, "", "", NULL },
     { "vt_cpio_busybox64", ventoy_cmd_cpio_busybox_64, 0, NULL, "", "", NULL },
@@ -4065,6 +4176,7 @@ static cmd_para ventoy_cmds[] =
     { "vt_get_fs_label", ventoy_cmd_get_fs_label, 0, NULL, "", "", NULL },
     { "vt_fs_enum_1st_file", ventoy_cmd_fs_enum_1st_file, 0, NULL, "", "", NULL },
     { "vt_file_basename", ventoy_cmd_basename, 0, NULL, "", "", NULL },    
+    { "vt_file_basefile", ventoy_cmd_basefile, 0, NULL, "", "", NULL },    
     { "vt_enum_video_mode", ventoy_cmd_enum_video_mode, 0, NULL, "", "", NULL },    
     { "vt_get_video_mode", ventoy_cmd_get_video_mode, 0, NULL, "", "", NULL },    
     { "vt_update_cur_video_mode", vt_cmd_update_cur_video_mode, 0, NULL, "", "", NULL },    

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

@@ -163,6 +163,8 @@ typedef struct ventoy_iso9660_vd
     grub_uint8_t res;
     char sys[32];
     char vol[32];
+    grub_uint8_t res2[8];
+    grub_uint32_t space;
 }ventoy_iso9660_vd;
 
 #pragma pack()
@@ -799,6 +801,19 @@ typedef struct menu_class
     struct menu_class *next;
 }menu_class;
 
+#define vtoy_custom_boot_image_file  0
+#define vtoy_custom_boot_directory   1
+
+typedef struct custom_boot
+{
+    int  type;
+    int  pathlen;
+    char path[256];
+    char cfg[256];
+
+    struct custom_boot *next;
+}custom_boot;
+
 #define vtoy_max_replace_file_size  (2 * 1024 * 1024)
 typedef struct conf_replace
 {
@@ -867,7 +882,11 @@ extern int g_ventoy_iso_uefi_drv;
 extern int g_ventoy_case_insensitive;
 extern grub_uint8_t g_ventoy_chain_type;
 extern int g_vhdboot_enable;
+
+#define VENTOY_IMG_WHITE_LIST   1
+#define VENTOY_IMG_BLACK_LIST   2
 extern int g_plugin_image_list;
+
 extern ventoy_gpt_info *g_ventoy_part_info;
 extern grub_uint64_t g_conf_replace_offset;
 extern grub_uint64_t g_svd_replace_offset;
@@ -939,6 +958,9 @@ grub_err_t ventoy_cmd_get_vtoy_type(grub_extcmd_context_t ctxt, int argc, char *
 int ventoy_check_password(const vtoy_password *pwd, int retry);
 int ventoy_gzip_compress(void *mem_in, int mem_in_len, void *mem_out, int mem_out_len);
 grub_uint64_t ventoy_get_part1_size(ventoy_gpt_info *gpt);
+int ventoy_plugin_add_custom_boot(const char *vcfgpath);
+const char * ventoy_plugin_get_custom_boot(const char *isopath);
+grub_err_t ventoy_cmd_dump_custom_boot(grub_extcmd_context_t ctxt, int argc, char **args);
 
 #endif /* __VENTOY_DEF_H__ */
 

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

@@ -49,6 +49,7 @@ static menu_password *g_pwd_head = NULL;
 static persistence_config *g_persistence_head = NULL;
 static menu_alias *g_menu_alias_head = NULL;
 static menu_class *g_menu_class_head = NULL;
+static custom_boot *g_custom_boot_head = NULL;
 static injection_config *g_injection_head = NULL;
 static auto_memdisk *g_auto_memdisk_head = NULL;
 static image_list *g_image_list_head = NULL;
@@ -1382,6 +1383,124 @@ static int ventoy_plugin_menuclass_check(VTOY_JSON *json, const char *isodisk)
     return 0;
 }
 
+static int ventoy_plugin_custom_boot_entry(VTOY_JSON *json, const char *isodisk)
+{
+    int type;
+    int len;
+    const char *key = NULL;
+    const char *cfg = NULL;
+    VTOY_JSON *pNode = NULL;
+    custom_boot *tail = NULL;
+    custom_boot *node = NULL;
+    custom_boot *next = NULL;
+
+    (void)isodisk;
+
+    if (json->enDataType != JSON_TYPE_ARRAY)
+    {
+        debug("Not array %d\n", json->enDataType);
+        return 0;
+    }
+
+    if (g_custom_boot_head)
+    {
+        for (node = g_custom_boot_head; node; node = next)
+        {
+            next = node->next;
+            grub_free(node);
+        }
+
+        g_custom_boot_head = NULL;
+    }
+
+    for (pNode = json->pstChild; pNode; pNode = pNode->pstNext)
+    {
+        type = vtoy_custom_boot_image_file;
+        key = vtoy_json_get_string_ex(pNode->pstChild, "file");
+        if (!key)
+        {
+            key = vtoy_json_get_string_ex(pNode->pstChild, "dir");
+            type = vtoy_custom_boot_directory;
+        }
+        
+        cfg = vtoy_json_get_string_ex(pNode->pstChild, "vcfg");
+        if (key && cfg)
+        {
+            node = grub_zalloc(sizeof(custom_boot));
+            if (node)
+            {
+                node->type = type;
+                node->pathlen = grub_snprintf(node->path, sizeof(node->path), "%s", key);
+                len = (int)grub_snprintf(node->cfg, sizeof(node->cfg), "%s", cfg);
+
+                if (len >= 5 && grub_strncmp(node->cfg + len - 5, ".vcfg", 5) == 0)
+                {
+                    if (g_custom_boot_head)
+                    {
+                        tail->next = node;
+                    }
+                    else
+                    {
+                        g_custom_boot_head = node;
+                    }
+                    tail = node;
+                }
+                else
+                {
+                    grub_free(node);
+                }
+            }
+        }
+    }
+
+    return 0;
+}
+
+static int ventoy_plugin_custom_boot_check(VTOY_JSON *json, const char *isodisk)
+{
+    int type;
+    int len;
+    const char *key = NULL;
+    const char *cfg = NULL;
+    VTOY_JSON *pNode = NULL;
+
+    (void)isodisk;
+
+    if (json->enDataType != JSON_TYPE_ARRAY)
+    {
+        grub_printf("Not array %d\n", json->enDataType);
+        return 1;
+    }
+
+    for (pNode = json->pstChild; pNode; pNode = pNode->pstNext)
+    {
+        type = vtoy_custom_boot_image_file;
+        key = vtoy_json_get_string_ex(pNode->pstChild, "file");
+        if (!key)
+        {
+            key = vtoy_json_get_string_ex(pNode->pstChild, "dir"); 
+            type = vtoy_custom_boot_directory;
+        }
+        
+        cfg = vtoy_json_get_string_ex(pNode->pstChild, "vcfg");
+        len = (int)grub_strlen(cfg);
+        if (key && cfg)
+        {
+            if (len < 5 || grub_strncmp(cfg + len - 5, ".vcfg", 5))
+            {
+                grub_printf("<%s> does not have \".vcfg\" suffix\n\n", cfg);
+            }
+            else
+            {
+                grub_printf("%s: <%s>\n", (type == vtoy_custom_boot_directory) ? "dir" : "file",  key);
+                grub_printf("vcfg: <%s>\n\n", cfg);                
+            }
+        }
+    }
+
+    return 0;
+}
+
 static int ventoy_plugin_conf_replace_entry(VTOY_JSON *json, const char *isodisk)
 {
     const char *isof = NULL;
@@ -1625,7 +1744,14 @@ static int ventoy_plugin_image_list_entry(VTOY_JSON *json, const char *isodisk)
         g_image_list_head = NULL;
     }
 
-    g_plugin_image_list = 1;
+    if (grub_strcmp(json->pcName, "image_blacklist") == 0)
+    {
+        g_plugin_image_list = VENTOY_IMG_BLACK_LIST;
+    }
+    else
+    {
+        g_plugin_image_list = VENTOY_IMG_WHITE_LIST;
+    }
 
     for (pNode = json->pstChild; pNode; pNode = pNode->pstNext)
     {
@@ -1693,9 +1819,11 @@ static plugin_entry g_plugin_entries[] =
     { "injection", ventoy_plugin_injection_entry, ventoy_plugin_injection_check },
     { "auto_memdisk", ventoy_plugin_auto_memdisk_entry, ventoy_plugin_auto_memdisk_check },
     { "image_list", ventoy_plugin_image_list_entry, ventoy_plugin_image_list_check },
+    { "image_blacklist", ventoy_plugin_image_list_entry, ventoy_plugin_image_list_check },
     { "conf_replace", ventoy_plugin_conf_replace_entry, ventoy_plugin_conf_replace_check },
     { "dud", ventoy_plugin_dud_entry, ventoy_plugin_dud_check },
     { "password", ventoy_plugin_pwd_entry, ventoy_plugin_pwd_check },
+    { "custom_boot", ventoy_plugin_custom_boot_entry, ventoy_plugin_custom_boot_check },
 };
 
 static int ventoy_parse_plugin_config(VTOY_JSON *json, const char *isodisk)
@@ -2057,6 +2185,96 @@ const char * ventoy_plugin_get_menu_class(int type, const char *name)
     return NULL;
 }
 
+int ventoy_plugin_add_custom_boot(const char *vcfgpath)
+{
+    int len;
+    custom_boot *node = NULL;
+    
+    node = grub_zalloc(sizeof(custom_boot));
+    if (node)
+    {
+        node->type = vtoy_custom_boot_image_file;
+        node->pathlen = grub_snprintf(node->path, sizeof(node->path), "%s", vcfgpath);
+        grub_snprintf(node->cfg, sizeof(node->cfg), "%s", vcfgpath);
+
+        /* .vcfg */
+        len = node->pathlen - 5;
+        node->path[len] = 0;
+        node->pathlen = len;
+
+        if (g_custom_boot_head)
+        {
+            node->next = g_custom_boot_head;
+        }
+        g_custom_boot_head = node;
+    }
+    
+    return 0;
+}
+
+const char * ventoy_plugin_get_custom_boot(const char *isopath)
+{
+    int i;
+    int len;
+    custom_boot *node = NULL;
+
+    if (!g_custom_boot_head)
+    {
+        return NULL;
+    }
+
+    len = (int)grub_strlen(isopath);
+    
+    for (node = g_custom_boot_head; node; node = node->next)
+    {
+        if (node->type == vtoy_custom_boot_image_file)
+        {
+            if (node->pathlen == len && grub_strncmp(isopath, node->path, len) == 0)
+            {
+                return node->cfg;                
+            }
+        }
+        else
+        {
+            if (node->pathlen < len && isopath[node->pathlen] == '/' && 
+                grub_strncmp(isopath, node->path, node->pathlen) == 0)
+            {
+                for (i = node->pathlen + 1; i < len; i++)
+                {
+                    if (isopath[i] == '/')
+                    {
+                        break;
+                    }
+                }
+
+                if (i >= len)
+                {
+                    return node->cfg;                
+                }
+            }
+        }
+    }
+
+    return NULL;
+}
+
+grub_err_t ventoy_cmd_dump_custom_boot(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    custom_boot *node = NULL;
+
+    (void)argc;
+    (void)ctxt;
+    (void)args;
+
+    for (node = g_custom_boot_head; node; node = node->next)
+    {
+        grub_printf("[%s] <%s>:<%s>\n", (node->type == vtoy_custom_boot_directory) ? "dir" : "file", 
+            node->path, node->cfg);
+    }
+
+    return 0;
+}
+
 int ventoy_plugin_check_memdisk(const char *isopath)
 {
     int len;

GRUB2/MOD_SRC/grub-2.04/install.sh

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

GRUB2/buildgrub.sh

@@ -11,19 +11,15 @@ mkdir SRC
 mkdir NBP
 mkdir PXE
 
-tar -xvf grub-2.04.tar.xz -C ./SRC/
+tar -xf grub-2.04.tar.xz -C ./SRC/
 
 /bin/cp -a ./MOD_SRC/grub-2.04  ./SRC/
 
 cd ./SRC/grub-2.04
 
-# build for Legacy BIOS 
-./autogen.sh
-./configure  --prefix=$VT_GRUB_DIR/INSTALL/
-make -j 16
-sh install.sh
 
-# build for UEFI
+# build for x86_64-efi
+echo '======== build grub2 for x86_64-efi ==============='
 make distclean
 ./autogen.sh
 ./configure  --with-platform=efi --prefix=$VT_GRUB_DIR/INSTALL/
@@ -31,7 +27,8 @@ make -j 16
 sh install.sh  uefi
 
 
-#build for IA32 EFI
+#build for i386-efi
+echo '======== build grub2 for i386-efi ==============='
 make distclean
 ./autogen.sh
 ./configure --target=i386 --with-platform=efi  --prefix=$VT_GRUB_DIR/INSTALL/
@@ -39,5 +36,35 @@ make -j 16
 sh install.sh  i386efi
 
 
+
+#build for arm64 EFI
+echo '======== build grub2 for arm64-efi ==============='
+PATH=$PATH:/opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu/bin
+make distclean
+./autogen.sh
+./configure  --prefix=$VT_GRUB_DIR/INSTALL/ \
+--target=aarch64 --with-platform=efi \
+--host=x86_64-linux-gnu  \
+HOST_CC=x86_64-linux-gnu-gcc \
+BUILD_CC=gcc \
+TARGET_CC=aarch64-linux-gnu-gcc   \
+TARGET_OBJCOPY=aarch64-linux-gnu-objcopy \
+TARGET_STRIP=aarch64-linux-gnu-strip TARGET_NM=aarch64-linux-gnu-nm \
+TARGET_RANLIB=aarch64-linux-gnu-ranlib
+make -j 16
+sh install.sh arm64
+
+
+
+# build for i386-pc
+echo '======== build grub2 for i386-pc ==============='
+make distclean
+./autogen.sh
+./configure --target=i386 --with-platform=pc --prefix=$VT_GRUB_DIR/INSTALL/
+make -j 16
+sh install.sh
+
+
+
 cd ../../
 

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

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

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

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

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

@@ -60,8 +60,6 @@ ventoy_os_install_dmsetup() {
     fi
 }
 
-wait_for_usb_disk_ready
-
 vtdiskname=$(get_ventoy_disk_name)
 if [ "$vtdiskname" = "unknown" ]; then
     vtlog "ventoy disk not found"
@@ -69,6 +67,14 @@ if [ "$vtdiskname" = "unknown" ]; then
     exit 0
 fi
 
+if check_usb_disk_ready "$vtdiskname"; then
+    vtlog "check_usb_disk_ready ok"
+else
+    vtlog "check_usb_disk_ready error"
+    PATH=$VTPATH_OLD
+    exit 0
+fi
+
 ventoy_os_install_dmsetup $vtdiskname
 
 ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace"

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

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

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

@@ -74,6 +74,14 @@ ventoy_get_debian_distro() {
         echo 'kylin'; return
     fi
     
+    if [ -f /scripts/00-ver ]; then
+        if $GREP -q 'Bliss-OS' /scripts/00-ver; then
+            echo 'bliss'; return
+        fi
+    fi
+    
+    
+    
     echo 'default'
 }
 

INSTALL/all_in_one.sh

@@ -2,63 +2,79 @@
 
 VTOY_PATH=$PWD/..
 
+LOG=$VTOY_PATH/DOC/build.log
+[ -f $LOG ] && rm -f $LOG
+
 cd $VTOY_PATH/DOC
-sh installdietlibc.sh
+echo "prepare_env ..."
+sh prepare_env.sh
 
+export PATH=$PATH:/opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu/bin:/opt/aarch64--uclibc--stable-2020.08-1/bin
+
+
+echo "build grub2 ..."
 cd $VTOY_PATH/GRUB2
-sh buildgrub.sh || exit 1
+sh buildgrub.sh >> $LOG 2>&1 || exit 1
 
+echo "build ipxe ..."
 cd $VTOY_PATH/IPXE
-sh buildipxe.sh || exit 1
+sh buildipxe.sh >> $LOG 2>&1 || exit 1
 
+echo "build edk2 ..."
 cd $VTOY_PATH/EDK2
-sh buildedk.sh || exit 1
-
-cd $VTOY_PATH/VtoyTool
-sh build.sh || exit 1
-
-cd $VTOY_PATH/vtoyfat/fat_io_lib
-sh buildlib.sh
-
-cd $VTOY_PATH/vtoyfat
-sh build.sh || exit 1
-
-cd $VTOY_PATH/vtoygpt
-sh build.sh || exit 1
-
-cd $VTOY_PATH/ExFAT
-sh buidlibfuse.sh || exit 1
-sh buidexfat.sh || exit 1
-/bin/cp -a EXFAT/shared/mkexfatfs   $VTOY_PATH/INSTALL/tool/mkexfatfs_64
-/bin/cp -a EXFAT/shared/mount.exfat-fuse   $VTOY_PATH/INSTALL/tool/mount.exfat-fuse_64
+sh buildedk.sh >> $LOG 2>&1 || exit 1
 
 
-cd $VTOY_PATH/FUSEISO
-sh build_libfuse.sh
-sh build.sh
 
-cd $VTOY_PATH/SQUASHFS/SRC
-sh build_lz4.sh
-sh build_lzma.sh
-sh build_lzo.sh
-sh build_zstd.sh
+#
+# We almost rarely modifiy these code, so no need to build them everytime
+# If you want to rebuild them, just uncomment them.
+#
 
-cd $VTOY_PATH/SQUASHFS/squashfs-tools-4.4/squashfs-tools
-sh build.sh
+#cd $VTOY_PATH/VtoyTool
+#sh build.sh || exit 1
 
-cd $VTOY_PATH/VBLADE/vblade-master
-sh build.sh
+#cd $VTOY_PATH/vtoyfat/fat_io_lib
+#sh buildlib.sh
 
-cd $VTOY_PATH/Ventoy2Disk/Ventoy2Disk/xz-embedded-20130513/userspace
-make -f ventoy_makefile
-strip --strip-all xzminidec
-rm -f $VTOY_PATH/IMG/cpio/ventoy/tool/xzminidec
-cp -a xzminidec $VTOY_PATH/IMG/cpio/ventoy/tool/xzminidec
-make clean; rm -f *.o
+#cd $VTOY_PATH/vtoyfat
+#sh build.sh || exit 1
+
+#cd $VTOY_PATH/vtoygpt
+#sh build.sh || exit 1
+
+#cd $VTOY_PATH/FUSEISO
+#sh build_libfuse.sh
+#sh build.sh
 
 
+# cd $VTOY_PATH/ExFAT
+# sh buidlibfuse.sh || exit 1
+# sh buidexfat.sh || exit 1
+# /bin/cp -a EXFAT/shared/mkexfatfs   $VTOY_PATH/INSTALL/tool/mkexfatfs_64
+# /bin/cp -a EXFAT/shared/mount.exfat-fuse   $VTOY_PATH/INSTALL/tool/mount.exfat-fuse_64
+
+
+# cd $VTOY_PATH/SQUASHFS/SRC
+# sh build_lz4.sh
+# sh build_lzma.sh
+# sh build_lzo.sh
+# sh build_zstd.sh
+
+# cd $VTOY_PATH/SQUASHFS/squashfs-tools-4.4/squashfs-tools
+# sh build.sh
+
+# cd $VTOY_PATH/VBLADE/vblade-master
+# sh build.sh
 
 cd $VTOY_PATH/INSTALL
-sh ventoy_pack.sh || exit 1
+
+if [ "$1" = "CI" ]; then
+    Ver=$(date +%m%d%H%M)
+    sed "s/VENTOY_VERSION=.*/VENTOY_VERSION=\"$Ver\"/"  -i ./grub/grub.cfg
+fi
+
+echo "packing ventoy-$Ver ..."
+sh ventoy_pack.sh $1 >> $LOG 2>&1 || exit 1
 
 echo -e '\n============== SUCCESS ==================\n'

INSTALL/docker_ci_build.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+VTOY_PATH=$PWD/..
+
+wget -q -P $VTOY_PATH/DOC/ https://www.fefe.de/dietlibc/dietlibc-0.34.tar.xz
+wget -q -P $VTOY_PATH/DOC/ https://musl.libc.org/releases/musl-1.2.1.tar.gz
+wget -q -P $VTOY_PATH/DOC/ https://musl.libc.org/releases/musl-1.2.1.tar.gz
+wget -q -P $VTOY_PATH/GRUB2/ https://ftp.gnu.org/gnu/grub/grub-2.04.tar.xz
+wget -q -O $VTOY_PATH/EDK2/edk2-edk2-stable201911.zip https://codeload.github.com/tianocore/edk2/zip/edk2-stable201911
+wget -q -P /opt/ 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
+wget -q -P /opt/ https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2020.08-1.tar.bz2
+
+sh all_in_one.sh CI

INSTALL/grub/debug.cfg

@@ -139,6 +139,15 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json {
         unset pager
     }
     
+    menuentry 'Check image blacklist plugin configuration' --class=debug_imageblacklist {
+        set pager=1
+        vt_check_plugin_json $vt_plugin_path image_blacklist $vtoy_iso_part
+        
+        echo -e "\npress ENTER to exit ..."
+        read vtInputKey
+        unset pager
+    }
+    
     menuentry 'Check boot conf replace plugin configuration' --class=debug_bootconf_replace {
         set pager=1
         vt_check_plugin_json $vt_plugin_path conf_replace $vtoy_iso_part

INSTALL/grub/grub.cfg

@@ -50,6 +50,21 @@ function ventoy_acpi_param {
     fi
 }
 
+function ventoy_vcfg_proc {
+    if vt_check_custom_boot "${1}" vt_vcfg; then
+        set vtoy_chosen_path="${1}"
+        vt_file_basefile "${vtoy_chosen_path}" vtoy_chosen_file
+        
+        export vtoy_chosen_path
+        export vtoy_chosen_file
+        ventoy_debug_pause
+        configfile "${vtoy_iso_part}${vt_vcfg}"
+        true
+    else
+        false
+    fi
+}
+
 function ventoy_power {
     configfile $prefix/power.cfg
 }
@@ -959,17 +974,34 @@ function ventoy_iso_busybox_ver {
     fi
 }
 
+
 function iso_common_menuentry {
     unset vt_system_id
     unset vt_volume_id
     
     vt_chosen_img_path vt_chosen_path vt_chosen_size
-    vt_parse_iso_volume "${vtoy_iso_part}${vt_chosen_path}" vt_system_id vt_volume_id
+
+    vt_parse_iso_volume "${vtoy_iso_part}${vt_chosen_path}" vt_system_id vt_volume_id vt_volume_space
+    if [ $vt_volume_space -ne $vt_chosen_size ]; then        
+        vt_mod $vt_chosen_size 2048 vt_chosen_size_mod
+        if [ $vt_volume_space -gt $vt_chosen_size -o $vt_chosen_size_mod -ne 0 ]; then
+            echo -e "\n $vt_volume_space $vt_chosen_size $vt_chosen_size_mod\n"
+            echo -e "\n The size of the iso file \"$vt_chosen_size\" is invalid. File corrupted ?\n"
+            echo -e " 此ISO文件的大小 \"$vt_chosen_size\" 有问题，请确认文件是否损坏。\n"
+            echo -e "\n press ENTER to exit (请按 回车 键返回) ..."
+            read vtInputKey
+            return
+        fi
+    fi
     
     if vt_check_password "${vt_chosen_path}"; then
         return
     fi
-        
+
+    if ventoy_vcfg_proc "${vt_chosen_path}"; then        
+        return
+    fi
+
     if vt_str_begin "$vt_volume_id" "Avira"; then 
         vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}"
     fi
@@ -1039,6 +1071,10 @@ function wim_common_menuentry {
         return
     fi
     
+    if ventoy_vcfg_proc "${vt_chosen_path}"; then        
+        return
+    fi
+    
     if vt_wim_check_bootable "${vtoy_iso_part}${vt_chosen_path}"; then
         vt_wim_chain_data "${vtoy_iso_part}${vt_chosen_path}"
     else
@@ -1074,6 +1110,10 @@ function efi_common_menuentry {
         return
     fi
     
+    if ventoy_vcfg_proc "${vt_chosen_path}"; then        
+        return
+    fi
+    
     vt_concat_efi_iso "${vtoy_iso_part}${vt_chosen_path}" vtoy_iso_buf
     
     ventoy_debug_pause
@@ -1115,6 +1155,10 @@ function vhd_common_menuentry {
         return
     fi
     
+    if ventoy_vcfg_proc "${vt_chosen_path}"; then        
+        return
+    fi
+    
     vt_patch_vhdboot "$vt_chosen_path"
     
     ventoy_debug_pause    
@@ -1180,7 +1224,7 @@ function vtoyboot_common_func {
                 linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} bios80  sector512  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}   
                 boot
             else
-                ventoy_acpi_param ${vtoy_chain_mem_addr} 512
+                vt_acpi_param ${vtoy_chain_mem_addr} 512
                 ventoy_cli_console
                 chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi sector512 env_param=${ventoy_env_param} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
                 boot
@@ -1203,6 +1247,10 @@ function vtoy_common_menuentry {
         return
     fi    
     
+    if ventoy_vcfg_proc "${vt_chosen_path}"; then        
+        return
+    fi
+    
     vtoyboot_common_func "${vtoy_iso_part}${vt_chosen_path}"
 }
 
@@ -1406,6 +1454,10 @@ function img_common_menuentry {
         return
     fi
 
+    if ventoy_vcfg_proc "${vt_chosen_path}"; then        
+        return
+    fi
+
     if [ -d (vtimghd)/ ]; then
         loopback -d vtimghd
     fi
@@ -1484,7 +1536,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.33"
+set VENTOY_VERSION="1.0.34"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -1631,6 +1683,17 @@ if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then
     read vtInputKey 
 fi
 
+for vtTFile in ventoy.json ventoy_grub.cfg; do
+    if [ -f $vtoy_efi_part/ventoy/$vtTFile ]; then
+        clear
+        echo -e "\n You need to put $vtTFile in the 1st partition which hold the ISO files.\n"
+        echo -e " $vtTFile 放错分区了，请放到镜像分区里的 ventoy 目录下（此目录需要手动创建）！\n"
+        echo -e "\n press ENTER to continue (请按 回车 键继续) ..."
+        read vtInputKey
+    fi
+done
+
+
 #export necessary variable
 export theme
 export gfxmode

INSTALL/tool/VentoyWorker.sh

@@ -325,8 +325,8 @@ if [ "$MODE" = "install" ]; then
         mkdir ./tmp_mnt
         
         vtdebug "mounting part2 ...."
-        for tt in 1 2 3; do
-            if mount ${PART2} ./tmp_mnt; then
+        for tt in 1 2 3 4 5; do            
+            if mount ${PART2} ./tmp_mnt > /dev/null 2>&1; then
                 vtdebug "mounting part2 success"
                 break
             fi
@@ -334,7 +334,7 @@ if [ "$MODE" = "install" ]; then
             mtpnt=$(grep "^${PART2}" /proc/mounts | awk '{print $2}')
             if [ -n "$mtpnt" ]; then
                 umount $mtpnt >/dev/null 2>&1
-            fi
+            fi    
             sleep 2
         done
         
@@ -445,13 +445,15 @@ else
     if [ "$SECUREBOOT" != "YES" ]; then
         mkdir ./tmp_mnt
         
-        vtdebug "mounting part2 ...."
-        for tt in 1 2 3; do
-            if mount ${PART2} ./tmp_mnt; then
+        vtdebug "mounting part2 ...."        
+        for tt in 1 2 3 4 5; do            
+            if mount ${PART2} ./tmp_mnt > /dev/null 2>&1; then
                 vtdebug "mounting part2 success"
                 break
+            else
+                vtdebug "mounting part2 failed, now wait and retry..."
             fi
-            sleep 2
+            sleep 2            
         done
         
         rm -f ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
@@ -466,7 +468,7 @@ else
         
         
         for tt in 1 2 3; do
-            if umount ./tmp_mnt; then
+            if umount ./tmp_mnt > /dev/null 2>&1; then
                 vtdebug "umount part2 success"
                 rm -rf ./tmp_mnt
                 break

INSTALL/ventoy_pack.sh

@@ -1,5 +1,11 @@
 #!/bin/sh
 
+if [ "$1" = "CI" ]; then
+    OPT='-dR'
+else
+    OPT='-a'
+fi
+
 dos2unix -q ./tool/ventoy_lib.sh
 dos2unix -q ./tool/VentoyWorker.sh
 
@@ -49,21 +55,21 @@ mount ${LOOP}p2  $tmpmnt
 mkdir -p $tmpmnt/grub
 
 # First copy grub.cfg file, to make it locate at front of the part2
-cp -a ./grub/grub.cfg     $tmpmnt/grub/
+cp $OPT ./grub/grub.cfg     $tmpmnt/grub/
 
 ls -1 ./grub/ | grep -v 'grub\.cfg' | while read line; do
-    cp -a ./grub/$line $tmpmnt/grub/
+    cp $OPT ./grub/$line $tmpmnt/grub/
 done
 
-cp -a ./ventoy   $tmpmnt/
-cp -a ./EFI   $tmpmnt/
-cp -a ./tool/ENROLL_THIS_KEY_IN_MOKMANAGER.cer $tmpmnt/
+cp $OPT ./ventoy   $tmpmnt/
+cp $OPT ./EFI   $tmpmnt/
+cp $OPT ./tool/ENROLL_THIS_KEY_IN_MOKMANAGER.cer $tmpmnt/
 
 
 mkdir -p $tmpmnt/tool
-cp -a ./tool/i386/mount.exfat-fuse     $tmpmnt/tool/mount.exfat-fuse_i386
-cp -a ./tool/x86_64/mount.exfat-fuse   $tmpmnt/tool/mount.exfat-fuse_x86_64
-cp -a ./tool/aarch64/mount.exfat-fuse  $tmpmnt/tool/mount.exfat-fuse_aarch64
+cp $OPT ./tool/i386/mount.exfat-fuse     $tmpmnt/tool/mount.exfat-fuse_i386
+cp $OPT ./tool/x86_64/mount.exfat-fuse   $tmpmnt/tool/mount.exfat-fuse_x86_64
+cp $OPT ./tool/aarch64/mount.exfat-fuse  $tmpmnt/tool/mount.exfat-fuse_aarch64
 
 rm -f $tmpmnt/grub/i386-pc/*.img
 
@@ -79,12 +85,12 @@ dd if=$LOOP of=$tmpdir/boot/boot.img bs=1 count=512  status=none
 dd if=$LOOP of=$tmpdir/boot/core.img bs=512 count=2047 skip=1 status=none
 xz --check=crc32 $tmpdir/boot/core.img
 
-cp -a ./tool $tmpdir/
+cp $OPT ./tool $tmpdir/
 rm -f $tmpdir/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
-cp -a Ventoy2Disk.sh $tmpdir/
-cp -a README $tmpdir/
-cp -a plugin $tmpdir/
-cp -a CreatePersistentImg.sh $tmpdir/
+cp $OPT Ventoy2Disk.sh $tmpdir/
+cp $OPT README $tmpdir/
+cp $OPT plugin $tmpdir/
+cp $OPT CreatePersistentImg.sh $tmpdir/
 dos2unix -q $tmpdir/Ventoy2Disk.sh
 dos2unix -q $tmpdir/CreatePersistentImg.sh
 
@@ -120,8 +126,8 @@ tar -czvf ventoy-${curver}-linux.tar.gz $tmpdir
 
 
 rm -f ventoy-${curver}-windows.zip
-cp -a Ventoy2Disk*.exe $tmpdir/
-cp -a $LANG_DIR/languages.ini $tmpdir/ventoy/
+cp $OPT Ventoy2Disk*.exe $tmpdir/
+cp $OPT $LANG_DIR/languages.ini $tmpdir/ventoy/
 rm -rf $tmpdir/tool
 rm -f $tmpdir/*.sh
 rm -f $tmpdir/README
@@ -132,7 +138,12 @@ zip -r ventoy-${curver}-windows.zip $tmpdir/
 rm -rf $tmpdir
 
 cd ../LiveCD
-sh livecd.sh
+if [ "$1" = "CI" ]; then
+    echo "=============== run docker_ci.sh ==============="
+    sh docker_ci.sh $1
+fi
+echo "=============== run livecd.sh ==============="
+sh livecd.sh $1
 cd $CurDir
 
 mv ../LiveCD/ventoy*.iso ./

IPXE/buildipxe.sh

@@ -2,7 +2,7 @@
 
 rm -rf ipxe-3fe683e
 
-tar -xvf ipxe_org_code/ipxe-3fe683e.tar.bz2 -C ./
+tar -xf ipxe_org_code/ipxe-3fe683e.tar.bz2 -C ./
 
 rm -rf ./ipxe-3fe683e/src/bin
 rm -rf ./ipxe-3fe683e/src/drivers
@@ -11,6 +11,7 @@ rm -rf ./ipxe-3fe683e/src/drivers
 
 cd ipxe-3fe683e/src
 
+echo '========= build IPXE =========='
 sh build.sh
 
 cd ../../

LiveCD/ISO/EFI/boot/grub.cfg

@@ -5,13 +5,13 @@ set default=LiveCD
 clear
 
 menuentry 'Ventoy xxx LiveCD' --id=LiveCD {    
-    linux  /EFI/boot/vmlinuz quiet loglevel=0 superuser rdinit=/ventoy/init.sh
-    initrd /EFI/ventoy/ventoy.gz /EFI/boot/core.gz /EFI/boot/modules.gz newc:ventoy.tar.gz:/EFI/ventoy/ventoy-xxx-linux.tar.gz
+    linux  /EFI/boot/vmlinuz64 quiet loglevel=0 superuser rdinit=/ventoy/init.sh
+    initrd /EFI/ventoy/ventoy.gz /EFI/boot/corepure64.gz /EFI/boot/modules64.gz newc:ventoy.tar.gz:/EFI/ventoy/ventoy-xxx-linux.tar.gz
     boot
 }
 
 menuentry 'Ventoy xxx LiveCD (Debug Mode)' {    
-    linux  /EFI/boot/vmlinuz loglevel=10 multivt superuser  rdinit=/ventoy/init.sh
-    initrd /EFI/ventoy/ventoy.gz /EFI/boot/core.gz /EFI/boot/modules.gz newc:ventoy.tar.gz:/EFI/ventoy/ventoy-xxx-linux.tar.gz
+    linux  /EFI/boot/vmlinuz64 loglevel=10 multivt superuser  rdinit=/ventoy/init.sh
+    initrd /EFI/ventoy/ventoy.gz /EFI/boot/corepure64.gz /EFI/boot/modules64.gz newc:ventoy.tar.gz:/EFI/ventoy/ventoy-xxx-linux.tar.gz
     boot
 }

LiveCD/README.txt

@@ -3,32 +3,32 @@ Ventoy LiveCD is  Tinycore distro + Ventoy linux install package.
 
 
 vmlinuz and core.gz are downloaded from:
-http://www.tinycorelinux.net/11.x/x86/release/distribution_files/
+http://www.tinycorelinux.net/11.x/x86_64/release/distribution_files/
 
 MD5SUM:
-0fd08c73e84b26aabbd0d12006d64855  core.gz
-a9c2e2abbf464517e681234fb4687aa1  vmlinuz
-
+598db33adff41155f26e244e492916d0  corepure64.gz
+858a5b2524cc541efe2d22b11b271e52  modules64.gz
+ab3a8196df5a84889f16494fde188799  vmlinuz64
 
 
 VTOY/ventoy/tcz/*/tcz are downloaded from:
-http://distro.ibiblio.org/tinycorelinux/11.x/x86/tcz/
+http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/
 
 MD5SUM:
-b6153a469d1d56e1e6895c6812a344cd  dosfstools.tcz
-29a4585d38b34ad58f8a7cb2d09e065f  glib2.tcz
-6812067a60165aee3cbcc07a75b6b1f4  libffi.tcz
-5120e0c9ee65f936dea8cb6a0a0a1ddd  liblvm2.tcz
-92909db8fb3c4333a2a4a325ffbf4b50  ncursesw.tcz
-e2bb47c9da2abab62fa794d69aba97c0  parted.tcz
-0e6dfbebe816062a81aff6d3e5e7719b  readline.tcz
-3cf996373ab01be269ea0efaf17ce0cd  udev-lib.tcz
+803ac92b15e2ba58cddc58e1ff66446c  dosfstools.tcz
+eaa8aafb285b3f3bdf89187a964436db  glib2.tcz
+bbf81e97259faa73cbaf42b7e76c8685  libffi.tcz
+2cb278ef278a6b8819df52ec2e6bedc3  liblvm2.tcz
+0345a267ab49e711c596e21eaf721e3b  ncursesw.tcz
+65e226c963e78a0174baf99bc9cafcfc  parted.tcz
+ae78bbe0c5b7d79382cd1aeb08dc97bd  readline.tcz
+dff3775dea468c31e517f5ec5f403ce0  udev-lib.tcz
 
 
 VTOY/ventoy/drivers/*.ko
 build kernel
-http://www.tinycorelinux.net/11.x/x86/release/src/kernel/
-config-5.4.3-tinycore
-linux-5.4.3-patched.txz           
+http://www.tinycorelinux.net/11.x/x86_64/release/src/kernel/
+config-5.4.3-tinycore64
+linux-5.4.3-patched.txz        
 disable a wireless lan driver to avoid compile error
 

LiveCD/VTOY/ventoy/init.sh

@@ -9,4 +9,6 @@ done
 sleep 5
 
 echo "sh /ventoy/profile.sh" >> /root/.profile
+
+ln -s /lib /lib64
 exec /init

LiveCD/VTOY/ventoy/modlist

@@ -12,8 +12,6 @@ sisusbvga
 usb251xb
 pi3usb30532
 usb-otg-fsm
-usb-conn-gpio
-ulpi
 ums-realtek
 xhci-hcd
 xhci-pci

LiveCD/docker_ci.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+VENTOY_PATH=$PWD/../
+
+for i in vmlinuz64 corepure64.gz modules64.gz; do
+    wget -q -P ISO/EFI/boot/ http://www.tinycorelinux.net/11.x/x86_64/release/distribution_files/$i
+done
+
+[ -d VTOY/ventoy/tcz ] || mkdir -p VTOY/ventoy/tcz
+
+for i in dosfstools.tcz glib2.tcz libffi.tcz liblvm2.tcz ncursesw.tcz parted.tcz readline.tcz udev-lib.tcz; do
+    wget -q -P VTOY/ventoy/tcz/ http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/$i
+done

LiveCD/livecd.sh

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+if [ "$1" = "CI" ]; then
+    OPT='-dR'
+else
+    OPT='-a'
+fi
+
 VENTOY_PATH=$PWD/../
 
 if ! [ -f $VENTOY_PATH/INSTALL/grub/grub.cfg ]; then
@@ -17,10 +23,28 @@ fi
 rm -rf ISO_TMP
 cp -a ISO ISO_TMP
 
-cp -a VTOY VTOY_TMP && cd VTOY_TMP
-gcc -O2 -m32 ./ventoy/disksize.c -o ./ventoy/disksize
+cp -a VTOY VTOY_TMP 
+
+ls -la
+if ! [ -d ISO_TMP ]; then
+    echo "Copy ISO_TMP failed"
+    exit 1
+fi
+
+if ! [ -d VTOY_TMP ]; then
+    echo "Copy VTOY_TMP failed"
+    exit 1
+fi
+
+mkdir -p ISO_TMP/EFI/ventoy
+cd VTOY_TMP
+
+gcc -O2 ./ventoy/disksize.c -o ./ventoy/disksize
+
 rm -f ./ventoy/disksize.c
-find . | cpio  -o -H newc | gzip -9 > ../ISO_TMP/EFI/ventoy/ventoy.gz
+
+chmod +x ./ventoy/*.sh
+find . | cpio  -o -H newc | gzip -c -9 > ../ISO_TMP/EFI/ventoy/ventoy.gz
 cd .. && rm -rf VTOY_TMP
 
 
@@ -37,7 +61,7 @@ dd if=/dev/zero of=efi.img bs=1M count=2
 mkfs.vfat efi.img
 mount efi.img efimnt
 mkdir -p efimnt/EFI/boot
-cp -a GRUB/bootx64.efi efimnt/EFI/boot/
+cp $OPT GRUB/bootx64.efi efimnt/EFI/boot/
 umount efimnt
 
 sync