update CI build script

[Ventoy.git] / INSTALL / grub / grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 95df45ba6f94eef93e657c29a00f0908659d382b..15fe1e61f34bf4f74c9a529b21e03b8cefa3bc34 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -46,7 +46,7 @@ function ventoy_gui_console {
 
 function ventoy_acpi_param {  
     if [ "$VTOY_PARAM_NO_ACPI" != "1" ]; then
 
 function ventoy_acpi_param {  
     if [ "$VTOY_PARAM_NO_ACPI" != "1" ]; then

-        vt_acpi_param $1 $2
+        vt_acpi_param "$1" "$2"

     fi
 }
 
     fi
 }
 


@@ -92,6 +92,9 @@ function get_os_type {
         elif [ -e (loop)/bin/freebsd-version ]; then
             set vtoy_os=Unix
             set vt_unix_type=FreeBSD
         elif [ -e (loop)/bin/freebsd-version ]; then
             set vtoy_os=Unix
             set vt_unix_type=FreeBSD

+        elif vt_str_begin "$vt_system_id" "DragonFly"; then
+            set vtoy_os=Unix
+            set vt_unix_type=DragonFly

             
             
         elif [ -e (loop)/boot/kernel/kernel ]; then            
             
             
         elif [ -e (loop)/boot/kernel/kernel ]; then            


@@ -106,13 +109,13 @@ function get_os_type {
     fi
 
     if [ -n "${vtdebug_flag}" ]; then
     fi
 
     if [ -n "${vtdebug_flag}" ]; then

-        echo ISO is $vtoy_os
+        echo ISO is "$vtoy_os"

     fi
 }
 
 function vt_check_compatible_pe {
     #Check for PE without external tools
     fi
 }
 
 function vt_check_compatible_pe {
     #Check for PE without external tools

-    if [ -f $1/HBCD_PE.ini ]; then
+    if [ -f "$1/HBCD_PE.ini" ]; then

         set ventoy_compatible=YES        
     fi
 }
         set ventoy_compatible=YES        
     fi
 }


@@ -200,7 +203,7 @@ function distro_specify_initrd_file {
     
     if [ "$vt_chosen_size" = "1133375488" ]; then
         if [ -d (loop)/boot/grub/x86_64-efi ]; then
     
     if [ "$vt_chosen_size" = "1133375488" ]; then
         if [ -d (loop)/boot/grub/x86_64-efi ]; then

-            vt_cpio_busybox64
+            vt_cpio_busybox64 "64h"

         fi
     fi
 }
         fi
     fi
 }


@@ -230,6 +233,11 @@ function distro_specify_initrd_file_phase2 {
         if [ -f (loop)/parabola/boot/i686/parabolaiso.img ]; then 
             vt_linux_specify_initrd_file /parabola/boot/i686/parabolaiso.img
         fi
         if [ -f (loop)/parabola/boot/i686/parabolaiso.img ]; then 
             vt_linux_specify_initrd_file /parabola/boot/i686/parabolaiso.img
         fi

+    elif [ -f (loop)/parabola/boot/x86_64/initramfs-linux-libre.img ]; then
+        vt_linux_specify_initrd_file /parabola/boot/x86_64/initramfs-linux-libre.img
+        if [ -f (loop)/parabola/boot/i686/initramfs-linux-libre.img ]; then
+            vt_linux_specify_initrd_file /parabola/boot/i686/initramfs-linux-libre.img
+        fi

     elif [ -f (loop)/hyperbola/boot/x86_64/hyperiso.img ]; then 
         vt_linux_specify_initrd_file /hyperbola/boot/x86_64/hyperiso.img
         if [ -f (loop)/hyperbola/boot/i686/hyperiso.img ]; then 
     elif [ -f (loop)/hyperbola/boot/x86_64/hyperiso.img ]; then 
         vt_linux_specify_initrd_file /hyperbola/boot/x86_64/hyperiso.img
         if [ -f (loop)/hyperbola/boot/i686/hyperiso.img ]; then 


@@ -251,7 +259,7 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /isolinux/initrd.gz
     elif [ -f (loop)/syslinux/kernel/initramfs.gz ]; then 
         vt_linux_specify_initrd_file /syslinux/kernel/initramfs.gz    
         vt_linux_specify_initrd_file /isolinux/initrd.gz
     elif [ -f (loop)/syslinux/kernel/initramfs.gz ]; then 
         vt_linux_specify_initrd_file /syslinux/kernel/initramfs.gz    

-    elif vt_strstr $vt_volume_id "Daphile"; then
+    elif vt_strstr "$vt_volume_id" "Daphile"; then

         vt_linux_parse_initrd_isolinux   (loop)/isolinux/
     elif [ -f (loop)/boot/rootfs.xz ]; then 
         vt_linux_specify_initrd_file /boot/rootfs.xz
         vt_linux_parse_initrd_isolinux   (loop)/isolinux/
     elif [ -f (loop)/boot/rootfs.xz ]; then 
         vt_linux_specify_initrd_file /boot/rootfs.xz


@@ -265,6 +273,8 @@ function distro_specify_initrd_file_phase2 {
         fi
     elif [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then 
         vt_linux_specify_initrd_file /blackarch/boot/x86_64/archiso.img
         fi
     elif [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then 
         vt_linux_specify_initrd_file /blackarch/boot/x86_64/archiso.img

+    elif [ -f (loop)/blackarch/boot/x86_64/initramfs-linux.img ]; then 
+        vt_linux_specify_initrd_file /blackarch/boot/x86_64/initramfs-linux.img

         
     elif [ -f (loop)/install.amd/initrd.gz ]; then
         vt_linux_specify_initrd_file /live/initrd2.img
         
     elif [ -f (loop)/install.amd/initrd.gz ]; then
         vt_linux_specify_initrd_file /live/initrd2.img


@@ -272,13 +282,27 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /install.amd/gtk/initrd.gz
     elif [ -f (loop)/boot/grub/kernels.cfg ]; then
         vt_linux_parse_initrd_grub  file  (loop)/boot/grub/kernels.cfg
         vt_linux_specify_initrd_file /install.amd/gtk/initrd.gz
     elif [ -f (loop)/boot/grub/kernels.cfg ]; then
         vt_linux_parse_initrd_grub  file  (loop)/boot/grub/kernels.cfg

-
+    elif [ -f (loop)/austrumi/initrd.gz ]; then
+        vt_linux_specify_initrd_file /austrumi/initrd.gz
+        if [ -f (loop)/EFI/BOOT/bootx64.efi ]; then
+            vt_cpio_busybox64 "64h"
+        fi
+    elif [ -f (loop)/boot/initfs.x86_64-efi ]; then
+        vt_linux_specify_initrd_file /boot/initfs.x86_64-efi
+        if [ -f (loop)/boot/initfs.i386-pc ]; then
+            vt_linux_specify_initrd_file /boot/initfs.i386-pc
+        fi
+    elif [ -f (loop)/antiX/initrd.gz ]; then
+        vt_linux_specify_initrd_file /antiX/initrd.gz
+    elif [ -f (loop)/360Disk/initrd.gz ]; then
+        vt_linux_specify_initrd_file /360Disk/initrd.gz
+    

     fi
 }
 
 function ventoy_get_ghostbsd_ver {
 
     fi
 }
 
 function ventoy_get_ghostbsd_ver {
 

-    # vt_parse_iso_create_date $1/${chosen_path} vt_create_date    
+    # vt_parse_iso_create_date "$1/${chosen_path}" vt_create_date    

     # if regexp "^202005" "$vt_create_date"; then
         # set vt_freebsd_ver=12.x
     # fi
     # if regexp "^202005" "$vt_create_date"; then
         # set vt_freebsd_ver=12.x
     # fi


@@ -309,6 +333,21 @@ function ventoy_get_freenas_ver {
     fi
 }
 
     fi
 }
 

+function ventoy_get_truenas_ver {   
+    set vt_freebsd_ver=12.x
+
+    if [ -e (loop)/TrueNAS-MANIFEST ]; then
+        vt_parse_freenas_ver (loop)/TrueNAS-MANIFEST vt_truenas_ver
+        if regexp "^13\.[0-9]" "$vt_truenas_ver"; then
+            set vt_freebsd_ver=13.x
+        elif regexp "^12\.[0-9]" "$vt_truenas_ver"; then
+            set vt_freebsd_ver=12.x
+        elif regexp "^11\.[0-9]" "$vt_truenas_ver"; then
+            set vt_freebsd_ver=11.x
+        fi
+    fi
+}
+

 function ventoy_get_midnightbsd_ver {   
     set vt_freebsd_ver=11.x
 }
 function ventoy_get_midnightbsd_ver {   
     set vt_freebsd_ver=11.x
 }


@@ -317,11 +356,13 @@ function ventoy_freebsd_proc {
     set vtFreeBsdDistro=FreeBSD
 
     if vt_strstr "$vt_volume_id" "GHOSTBSD"; then
     set vtFreeBsdDistro=FreeBSD
 
     if vt_strstr "$vt_volume_id" "GHOSTBSD"; then

-        ventoy_get_ghostbsd_ver $1 ${chosen_path}
+        ventoy_get_ghostbsd_ver "$1" "${chosen_path}"

     elif vt_strstr "$vt_volume_id" "FREENAS"; then
     elif vt_strstr "$vt_volume_id" "FREENAS"; then

-        ventoy_get_freenas_ver $1 ${chosen_path}   
+        ventoy_get_freenas_ver "$1" "${chosen_path}"
+    elif vt_strstr "$vt_volume_id" "TRUENAS"; then
+        ventoy_get_truenas_ver "$1" "${chosen_path}"

     elif vt_strstr "$vt_volume_id" "FURYBSD"; then
     elif vt_strstr "$vt_volume_id" "FURYBSD"; then

-        ventoy_get_furybsd_ver $1 ${chosen_path}   
+        ventoy_get_furybsd_ver "$1" "${chosen_path}"  

     elif regexp "^13_[0-9]" "$vt_volume_id"; then
         set vt_freebsd_ver=13.x
     elif regexp "^12_[0-9]" "$vt_volume_id"; then
     elif regexp "^13_[0-9]" "$vt_volume_id"; then
         set vt_freebsd_ver=13.x
     elif regexp "^12_[0-9]" "$vt_volume_id"; then


@@ -333,7 +374,7 @@ function ventoy_freebsd_proc {
     elif regexp "^9_[0-9]" "$vt_volume_id"; then
         set vt_freebsd_ver=9.x
     elif [ -d (loop)/usr/midnightbsd-dist ]; then
     elif regexp "^9_[0-9]" "$vt_volume_id"; then
         set vt_freebsd_ver=9.x
     elif [ -d (loop)/usr/midnightbsd-dist ]; then

-        ventoy_get_midnightbsd_ver $1 ${chosen_path}
+        ventoy_get_midnightbsd_ver "$1" "${chosen_path}"

         set vtFreeBsdDistro=MidnightBSD
     elif [ -e (loop)/bin/freebsd-version ]; then
         vt_unix_parse_freebsd_ver (loop)/bin/freebsd-version vt_userland_ver
         set vtFreeBsdDistro=MidnightBSD
     elif [ -e (loop)/bin/freebsd-version ]; then
         vt_unix_parse_freebsd_ver (loop)/bin/freebsd-version vt_userland_ver


@@ -382,7 +423,7 @@ function ventoy_freebsd_proc {
     fi
     
     unset vt_unix_mod_path
     fi
     
     unset vt_unix_mod_path

-    for file in "/COPYRIGHT" "/FreeNAS-MANIFEST" "/version" "/etc/fstab"; do   
+    for file in "/COPYRIGHT" "/FreeNAS-MANIFEST" "/TrueNAS-MANIFEST" "/version" "/etc/fstab"; do   

         if [ -e (loop)${file} ]; then                    
             set vt_unix_mod_path=${file}
             break
         if [ -e (loop)${file} ]; then                    
             set vt_unix_mod_path=${file}
             break


@@ -394,7 +435,23 @@ function ventoy_freebsd_proc {
     fi
     
     vt_unix_replace_ko $vt_unix_mod_path (vtunix)/ventoy_unix/$vtFreeBsdDistro/geom_ventoy_ko/$vt_freebsd_ver/$vt_freebsd_bit/geom_ventoy.ko.xz
     fi
     
     vt_unix_replace_ko $vt_unix_mod_path (vtunix)/ventoy_unix/$vtFreeBsdDistro/geom_ventoy_ko/$vt_freebsd_ver/$vt_freebsd_bit/geom_ventoy.ko.xz

-    vt_unix_replace_conf FreeBSD ${1}${chosen_path} 
+    vt_unix_replace_conf FreeBSD "${1}${chosen_path}"
+}
+
+function ventoy_dragonfly_proc {
+
+    unset vt_unix_mod_path
+    for file in "/boot/kernel/initrd.img.gz"; do
+        if [ -e (loop)${file} ]; then                    
+            set vt_unix_mod_path=${file}
+            break
+        fi
+    done
+
+    vt_unix_replace_ko $vt_unix_mod_path ${vtoy_path}/dragonfly.mfs.xz
+    vt_unix_fill_image_desc
+    vt_unix_gzip_new_ko
+    vt_unix_replace_conf DragonFly "${1}${chosen_path}"

 }
 
 function ventoy_unix_comm_proc {
 }
 
 function ventoy_unix_comm_proc {


@@ -404,12 +461,13 @@ function ventoy_unix_comm_proc {
         loopback vtunix $vtoy_efi_part/ventoy/ventoy_unix.cpio
         
         if [ "$vt_unix_type" = "FreeBSD" ]; then
         loopback vtunix $vtoy_efi_part/ventoy/ventoy_unix.cpio
         
         if [ "$vt_unix_type" = "FreeBSD" ]; then

-            ventoy_freebsd_proc $1 ${chosen_path}        
+            ventoy_freebsd_proc "$1" "${chosen_path}"
+        elif [ "$vt_unix_type" = "DragonFly" ]; then
+            ventoy_dragonfly_proc "$1" "${chosen_path}"        

         elif [ "$vt_unix_type" = "NetBSD" ]; then
             echo "NetBSD not supported"
             
             
         elif [ "$vt_unix_type" = "NetBSD" ]; then
             echo "NetBSD not supported"
             
             

-            

         else
             if [ -n "${vtdebug_flag}" ]; then
                 echo "Unknown unix type"
         else
             if [ -n "${vtdebug_flag}" ]; then
                 echo "Unknown unix type"


@@ -417,7 +475,7 @@ function ventoy_unix_comm_proc {
         fi
     fi
     
         fi
     fi
     

-    vt_unix_chain_data ${1}${chosen_path}    
+    vt_unix_chain_data "${1}${chosen_path}"

     ventoy_debug_pause
 }
 
     ventoy_debug_pause
 }
 


@@ -430,7 +488,7 @@ function uefi_windows_menu_func {
         if [ "$ventoy_fs_probe" = "iso9660" ]; then
             loopback -d loop
             vt_iso9660_nojoliet 1            
         if [ "$ventoy_fs_probe" = "iso9660" ]; then
             loopback -d loop
             vt_iso9660_nojoliet 1            

-            loopback loop $1$2
+            loopback loop "$1$2"

         fi
         
         for file in "efi/microsoft/boot/bcd"; do
         fi
         
         for file in "efi/microsoft/boot/bcd"; do


@@ -446,13 +504,13 @@ function uefi_windows_menu_func {
         locate_wim
     fi
 
         locate_wim
     fi
 

-    vt_windows_chain_data ${1}${chosen_path}    
+    vt_windows_chain_data "${1}${chosen_path}"

     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console
     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console

-        chainloader ${vtoy_path}/ventoy_x64.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+        chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} iso_${ventoy_fs_probe} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}

         boot
     else
         echo "chain empty failed"
         boot
     else
         echo "chain empty failed"


@@ -467,10 +525,10 @@ function uefi_linux_menu_func {
         if [ "$ventoy_fs_probe" = "udf" ]; then
             loopback -d loop            
             set ventoy_fs_probe=iso9660
         if [ "$ventoy_fs_probe" = "udf" ]; then
             loopback -d loop            
             set ventoy_fs_probe=iso9660

-            loopback loop $1$2
+            loopback loop "$1$2"

         fi
         
         fi
         

-        vt_load_cpio  ${vtoy_path}/ventoy.cpio   $2 $1 "busybox=$ventoy_busybox_ver"
+        vt_load_cpio  ${vtoy_path}/ventoy.cpio   "$2" "$1" "busybox=$ventoy_busybox_ver"

         
         vt_linux_clear_initrd
         
         
         vt_linux_clear_initrd
         


@@ -521,10 +579,18 @@ function uefi_linux_menu_func {
             elif [ -d (loop)/blackarch ]; then
                 if [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then
                     vt_add_replace_file $vtindex "EFI\\archiso\\archiso.img"
             elif [ -d (loop)/blackarch ]; then
                 if [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then
                     vt_add_replace_file $vtindex "EFI\\archiso\\archiso.img"

+                elif [ -f (loop)/blackarch/boot/x86_64/initramfs-linux.img ]; then
+                    vt_add_replace_file $vtindex "blackarch\\boot\\x86_64\\initramfs-linux.img"
+                fi
+            elif [ -d (loop)/anarchy ]; then
+                if [ -f (loop)/anarchy/boot/x86_64/initramfs-linux.img ]; then
+                    vt_add_replace_file $vtindex "anarchy\\boot\\x86_64\\initramfs-linux.img"

                 fi
             elif [ -d (loop)/parabola ]; then
                 if [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then
                     vt_add_replace_file $vtindex "EFI\\parabolaiso\\parabolaiso.img"
                 fi
             elif [ -d (loop)/parabola ]; then
                 if [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then
                     vt_add_replace_file $vtindex "EFI\\parabolaiso\\parabolaiso.img"

+                elif [ -f (loop)/parabola/boot/x86_64/initramfs-linux-libre.img ]; then
+                    vt_add_replace_file $vtindex "parabola\\boot\\x86_64\\initramfs-linux-libre.img"

                 fi
             elif [ -f (loop)/EFI/BOOT/initrd.gz ]; then
                 vt_add_replace_file $vtindex "EFI\\BOOT\\initrd.gz"
                 fi
             elif [ -f (loop)/EFI/BOOT/initrd.gz ]; then
                 vt_add_replace_file $vtindex "EFI\\BOOT\\initrd.gz"


@@ -542,6 +608,8 @@ function uefi_linux_menu_func {
         elif [ -d (loop)/EFI/BOOT/entries ]; then
             if [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then
                 vt_add_replace_file 0 "EFI\\parabolaiso\\parabolaiso.img"
         elif [ -d (loop)/EFI/BOOT/entries ]; then
             if [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then
                 vt_add_replace_file 0 "EFI\\parabolaiso\\parabolaiso.img"

+            elif [ -f (loop)/parabola/boot/x86_64/initramfs-linux-libre.img ]; then
+                vt_add_replace_file $vtindex "parabola\\boot\\x86_64\\initramfs-linux-libre.img"

             fi
         elif [ -e (loop)/syslinux/alt0/full.cz ]; then
             vt_add_replace_file 0 "EFI\\BOOT\\full.cz"            
             fi
         elif [ -e (loop)/syslinux/alt0/full.cz ]; then
             vt_add_replace_file 0 "EFI\\BOOT\\full.cz"            


@@ -552,12 +620,18 @@ function uefi_linux_menu_func {
         
     fi
     
         
     fi
     

-    vt_linux_chain_data ${1}${chosen_path}
+    vt_linux_chain_data "${1}${chosen_path}"
+
+    if [ -n "$LoadIsoEfiDriver" -a $vt_chosen_size -lt 104857600 ]; then
+        if [ -f (loop)/efi/clover/cloverx64.efi ]; then
+            unset LoadIsoEfiDriver
+        fi
+    fi

 
     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console       
 
     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console       

-        chainloader ${vtoy_path}/ventoy_x64.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+        chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}

         boot
     else
         echo "chain empty failed"
         boot
     else
         echo "chain empty failed"


@@ -566,12 +640,12 @@ function uefi_linux_menu_func {
 }
 
 function uefi_unix_menu_func {
 }
 
 function uefi_unix_menu_func {

-    ventoy_unix_comm_proc $1 ${chosen_path}
+    ventoy_unix_comm_proc $1 "${chosen_path}"

     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console

-        chainloader ${vtoy_path}/ventoy_x64.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+        chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}

         boot
     else
         echo "chain empty failed"
         boot
     else
         echo "chain empty failed"


@@ -594,18 +668,18 @@ function uefi_iso_menu_func {
         unset LoadIsoEfiDriver
     fi
 
         unset LoadIsoEfiDriver
     fi
 

-    set chosen_path=$2
-    vt_select_auto_install ${chosen_path}
-    vt_select_persistence ${chosen_path}
+    set chosen_path="$2"
+    vt_select_auto_install "${chosen_path}"
+    vt_select_persistence "${chosen_path}"

 
 

-    if vt_is_udf ${1}${chosen_path}; then
+    if vt_is_udf "${1}${chosen_path}"; then

         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660
         vt_iso9660_nojoliet 0
     fi
 
         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660
         vt_iso9660_nojoliet 0
     fi
 

-    loopback loop ${1}${chosen_path}    
+    loopback loop "${1}${chosen_path}"

     get_os_type (loop)
     
     if [ -d (loop)/EFI ]; then
     get_os_type (loop)
     
     if [ -d (loop)/EFI ]; then


@@ -625,19 +699,19 @@ function uefi_iso_menu_func {
         vt_check_compatible (loop)        
     fi
     
         vt_check_compatible (loop)        
     fi
     

-    vt_img_sector ${1}${chosen_path}
+    vt_img_sector "${1}${chosen_path}"

     
     if [ "$ventoy_fs_probe" = "iso9660" ]; then
     
     if [ "$ventoy_fs_probe" = "iso9660" ]; then

-        vt_select_conf_replace ${1} ${chosen_path}
+        vt_select_conf_replace "${1}" "${chosen_path}"

     fi
     
     if [ "$vtoy_os" = "Windows" ]; then
         vt_check_compatible_pe (loop)        
     fi
     
     if [ "$vtoy_os" = "Windows" ]; then
         vt_check_compatible_pe (loop)        

-        uefi_windows_menu_func  $1 ${chosen_path}
+        uefi_windows_menu_func  "$1" "${chosen_path}"

     elif [ "$vtoy_os" = "Unix" ]; then
     elif [ "$vtoy_os" = "Unix" ]; then

-        uefi_unix_menu_func $1 ${chosen_path}
+        uefi_unix_menu_func "$1" "${chosen_path}"

     else
     else

-        uefi_linux_menu_func  $1 ${chosen_path}
+        uefi_linux_menu_func  "$1" "${chosen_path}"

     fi
 
     ventoy_gui_console
     fi
 
     ventoy_gui_console


@@ -645,10 +719,10 @@ function uefi_iso_menu_func {
 
 function uefi_iso_memdisk {    
     echo 'Loading ISO file to memory ...'
 
 function uefi_iso_memdisk {    
     echo 'Loading ISO file to memory ...'

-    vt_load_img_memdisk ${1}${2} vtoy_iso_buf
+    vt_load_img_memdisk "${1}${2}" vtoy_iso_buf

     
     ventoy_cli_console
     
     ventoy_cli_console

-    chainloader ${vtoy_path}/ventoy_x64.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size}
+    chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size}

     boot
     
     ventoy_gui_console
     boot
     
     ventoy_gui_console


@@ -663,7 +737,7 @@ function legacy_windows_menu_func {
         if [ "$ventoy_fs_probe" = "iso9660" ]; then
             loopback -d loop
             vt_iso9660_nojoliet 1
         if [ "$ventoy_fs_probe" = "iso9660" ]; then
             loopback -d loop
             vt_iso9660_nojoliet 1

-            loopback loop $1$2
+            loopback loop "$1$2"

         fi
         
         for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD"; do
         fi
         
         for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD"; do


@@ -681,7 +755,7 @@ function legacy_windows_menu_func {
         locate_wim
     fi
 
         locate_wim
     fi
 

-    vt_windows_chain_data ${1}${chosen_path}    
+    vt_windows_chain_data "${1}${chosen_path}"

     ventoy_debug_pause    
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
     ventoy_debug_pause    
     
     if [ -n "$vtoy_chain_mem_addr" ]; then


@@ -700,10 +774,10 @@ function legacy_linux_menu_func {
         if [ "$ventoy_fs_probe" = "udf" ]; then
             loopback -d loop
             set ventoy_fs_probe=iso9660
         if [ "$ventoy_fs_probe" = "udf" ]; then
             loopback -d loop
             set ventoy_fs_probe=iso9660

-            loopback loop $1$2
+            loopback loop "$1$2"

         fi
     
         fi
     

-        vt_load_cpio  $vtoy_path/ventoy.cpio  $2 $1 "busybox=$ventoy_busybox_ver"
+        vt_load_cpio  $vtoy_path/ventoy.cpio  "$2" "$1" "busybox=$ventoy_busybox_ver"

 
         vt_linux_clear_initrd
         
 
         vt_linux_clear_initrd
         


@@ -722,6 +796,8 @@ function legacy_linux_menu_func {
         if [ -d (loop)/arch/boot/syslinux ]; then
             vt_linux_parse_initrd_isolinux   (loop)/arch/boot/syslinux/  /arch/
             vt_linux_parse_initrd_isolinux   (loop)/arch/boot/syslinux/  /arch/boot/syslinux/
         if [ -d (loop)/arch/boot/syslinux ]; then
             vt_linux_parse_initrd_isolinux   (loop)/arch/boot/syslinux/  /arch/
             vt_linux_parse_initrd_isolinux   (loop)/arch/boot/syslinux/  /arch/boot/syslinux/

+        elif [ -d (loop)/anarchy/boot/syslinux ]; then
+            vt_linux_parse_initrd_isolinux   (loop)/anarchy/boot/syslinux/  /anarchy/

             
         #manjaro
         elif [ -d (loop)/manjaro ]; then
             
         #manjaro
         elif [ -d (loop)/manjaro ]; then


@@ -746,7 +822,7 @@ function legacy_linux_menu_func {
         locate_initrd
     fi
     
         locate_initrd
     fi
     

-    vt_linux_chain_data ${1}${chosen_path}    
+    vt_linux_chain_data "${1}${chosen_path}"

     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then


@@ -761,7 +837,7 @@ function legacy_linux_menu_func {
 
 
 function legacy_unix_menu_func {    
 
 
 function legacy_unix_menu_func {    

-    ventoy_unix_comm_proc $1 ${chosen_path}
+    ventoy_unix_comm_proc $1 "${chosen_path}"

     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         #ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         #ventoy_acpi_param ${vtoy_chain_mem_addr} 2048


@@ -780,18 +856,19 @@ function legacy_iso_menu_func {
         loopback -d loop
     fi
 
         loopback -d loop
     fi
 

-    set chosen_path=$2
-    vt_select_auto_install ${chosen_path}
-    vt_select_persistence ${chosen_path}
+    set chosen_path="$2"
+    
+    vt_select_auto_install "${chosen_path}"
+    vt_select_persistence "${chosen_path}"

 
 

-    if vt_is_udf ${1}${chosen_path}; then
+    if vt_is_udf "${1}${chosen_path}"; then

         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660
         vt_iso9660_nojoliet 0
     fi
     
         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660
         vt_iso9660_nojoliet 0
     fi
     

-    loopback loop ${1}${chosen_path}
+    loopback loop "${1}${chosen_path}"

     
     get_os_type (loop)
     
     
     get_os_type (loop)
     


@@ -804,19 +881,19 @@ function legacy_iso_menu_func {
         vt_check_compatible (loop)
     fi
     
         vt_check_compatible (loop)
     fi
     

-    vt_img_sector ${1}${chosen_path}
+    vt_img_sector "${1}${chosen_path}"

 
     if [ "$ventoy_fs_probe" = "iso9660" ]; then
 
     if [ "$ventoy_fs_probe" = "iso9660" ]; then

-        vt_select_conf_replace ${1} ${chosen_path}
+        vt_select_conf_replace "${1}" "${chosen_path}"

     fi
 
     if [ "$vtoy_os" = "Windows" ]; then
         vt_check_compatible_pe (loop)        
     fi
 
     if [ "$vtoy_os" = "Windows" ]; then
         vt_check_compatible_pe (loop)        

-        legacy_windows_menu_func  $1 ${chosen_path}
+        legacy_windows_menu_func  "$1" "${chosen_path}"

     elif [ "$vtoy_os" = "Unix" ]; then
     elif [ "$vtoy_os" = "Unix" ]; then

-        legacy_unix_menu_func $1 ${chosen_path}
+        legacy_unix_menu_func "$1" "${chosen_path}"

     else
     else

-        legacy_linux_menu_func  $1 ${chosen_path}
+        legacy_linux_menu_func  "$1" "${chosen_path}"

     fi
 }
 
     fi
 }
 


@@ -824,7 +901,7 @@ function legacy_iso_memdisk {
 
     linux16   $vtoy_path/memdisk iso raw    
     echo "Loading ISO file to memory ..."
 
     linux16   $vtoy_path/memdisk iso raw    
     echo "Loading ISO file to memory ..."

-    initrd16  ${1}${2}
+    initrd16  "${1}${2}"

     boot
 }
 
     boot
 }
 


@@ -834,11 +911,11 @@ function iso_endless_os_proc {
         loopback -d loop
     fi
 
         loopback -d loop
     fi
 

-    loopback loop ${1}${2}   
-    vt_img_sector ${1}${2}
+    loopback loop "${1}${2}"
+    vt_img_sector "${1}${2}"

 
 

-    vt_load_cpio  $vtoy_path/ventoy.cpio  $2 $1  "busybox=$ventoy_busybox_ver"
-    vt_trailer_cpio $1 $2 noinit
+    vt_load_cpio  $vtoy_path/ventoy.cpio  "$2" "$1"  "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio "$1" "$2" noinit

     
     ventoy_debug_pause
 
     
     ventoy_debug_pause
 


@@ -860,18 +937,25 @@ function iso_endless_os_proc {
 
 
 function ventoy_iso_busybox_ver {
 
 
 function ventoy_iso_busybox_ver {

-    set ventoy_busybox_ver=32
+
+    if [ "$VTOY_EFI_ARCH" = "aa64" ]; then
+        set ventoy_busybox_ver=a64
+    else
+        set ventoy_busybox_ver=32

     
     

-    #special process for deepin-live iso
-    if [ "$vt_chosen_size" = "403701760" ]; then
-        if vt_str_str $vt_chosen_path "/deepin-live"; then
+        #special process for deepin-live iso
+        if [ "$vt_chosen_size" = "403701760" ]; then
+            if vt_str_str "$vt_chosen_path" "/deepin-live"; then
+                set ventoy_busybox_ver=64
+            fi
+        elif vt_str_begin "$vt_volume_id" "PHOTON_"; then
+            set ventoy_busybox_ver=64
+        elif vt_str_begin "$vt_volume_id" "smgl-test-quinq-x86_64"; then
+            set ventoy_busybox_ver=64
+        elif vt_str_begin "$vt_volume_id" "LDiagBootable"; then

             set ventoy_busybox_ver=64
             set ventoy_busybox_ver=64

+

         fi
         fi

-    elif vt_str_begin $vt_volume_id "PHOTON_"; then
-        set ventoy_busybox_ver=64
-    elif vt_str_begin $vt_volume_id "smgl-test-quinq-x86_64"; then
-        set ventoy_busybox_ver=64
-        

     fi
 }
 
     fi
 }
 


@@ -880,28 +964,36 @@ function iso_common_menuentry {
     unset vt_volume_id
     
     vt_chosen_img_path vt_chosen_path vt_chosen_size
     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
+    
+    if vt_check_password "${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

     
     ventoy_iso_busybox_ver
     
     #special process for Endless OS
     
     ventoy_iso_busybox_ver
     
     #special process for Endless OS

-    if vt_str_begin $vt_volume_id "Endless-OS"; then
-        iso_endless_os_proc $vtoy_iso_part $vt_chosen_path
-    elif vt_str_begin $vt_volume_id "TENS-Public"; then
+    if vt_str_begin "$vt_volume_id" "Endless-OS"; then
+        iso_endless_os_proc $vtoy_iso_part "$vt_chosen_path"
+    elif vt_str_begin "$vt_volume_id" "TENS-Public"; then

         set vtcompat=1
     fi
 
     if [ "$grub_platform" = "pc" ]; then
         if vt_check_mode 0; then
         set vtcompat=1
     fi
 
     if [ "$grub_platform" = "pc" ]; then
         if vt_check_mode 0; then

-            legacy_iso_memdisk $vtoy_iso_part $vt_chosen_path
+            legacy_iso_memdisk $vtoy_iso_part "$vt_chosen_path"

         else
         else

-            legacy_iso_menu_func $vtoy_iso_part $vt_chosen_path
+            legacy_iso_menu_func $vtoy_iso_part "$vt_chosen_path"

         fi
     else
         if vt_check_mode 0; then
         fi
     else
         if vt_check_mode 0; then

-            uefi_iso_memdisk $vtoy_iso_part  $vt_chosen_path
+            uefi_iso_memdisk $vtoy_iso_part  "$vt_chosen_path"

         else
         else

-            uefi_iso_menu_func $vtoy_iso_part  $vt_chosen_path             
+            uefi_iso_menu_func $vtoy_iso_part  "$vt_chosen_path"

         fi
     fi      
 }
         fi
     fi      
 }


@@ -909,14 +1001,18 @@ function iso_common_menuentry {
 function miso_common_menuentry {
     vt_chosen_img_path vt_chosen_path vt_chosen_size
 
 function miso_common_menuentry {
     vt_chosen_img_path vt_chosen_path vt_chosen_size
 

+    if vt_check_password "${vt_chosen_path}"; then
+        return
+    fi
+

     echo "memdisk mode boot for $vt_chosen_path"
     echo ""
     ventoy_debug_pause
 
     if [ "$grub_platform" = "pc" ]; then
     echo "memdisk mode boot for $vt_chosen_path"
     echo ""
     ventoy_debug_pause
 
     if [ "$grub_platform" = "pc" ]; then

-        legacy_iso_memdisk $vtoy_iso_part $vt_chosen_path
+        legacy_iso_memdisk $vtoy_iso_part "$vt_chosen_path"

     else
     else

-        uefi_iso_memdisk $vtoy_iso_part  $vt_chosen_path
+        uefi_iso_memdisk $vtoy_iso_part  "$vt_chosen_path"

     fi      
 }
 
     fi      
 }
 


@@ -938,7 +1034,17 @@ function iso_unsupport_menuentry {
 
 function wim_common_menuentry {
     vt_chosen_img_path vt_chosen_path vt_chosen_size
 
 function wim_common_menuentry {
     vt_chosen_img_path vt_chosen_path vt_chosen_size

-    vt_wim_chain_data ${vtoy_iso_part}${vt_chosen_path}
+    
+    if vt_check_password "${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
+        echo -e "\n This is NOT a bootable WIM file. \n"
+        echo -e " 这不是一个可启动的 WIM 文件。\n"
+    fi

     
     ventoy_debug_pause    
     
     
     ventoy_debug_pause    
     


@@ -947,7 +1053,7 @@ function wim_common_menuentry {
             linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}            
         else
             ventoy_cli_console
             linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}            
         else
             ventoy_cli_console

-            chainloader ${vtoy_path}/ventoy_x64.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+            chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}

             ventoy_gui_console
         fi
         boot
             ventoy_gui_console
         fi
         boot


@@ -964,19 +1070,23 @@ function wim_unsupport_menuentry {
 function efi_common_menuentry {
     vt_chosen_img_path vt_chosen_path vt_chosen_size
     
 function efi_common_menuentry {
     vt_chosen_img_path vt_chosen_path vt_chosen_size
     

-    vt_concat_efi_iso ${vtoy_iso_part}${vt_chosen_path} vtoy_iso_buf
+    if vt_check_password "${vt_chosen_path}"; then
+        return
+    fi
+    
+    vt_concat_efi_iso "${vtoy_iso_part}${vt_chosen_path}" vtoy_iso_buf

     
     ventoy_debug_pause
     
     ventoy_cli_console
 
     unset vtoy_dotefi_retry
     
     ventoy_debug_pause
     
     ventoy_cli_console
 
     unset vtoy_dotefi_retry

-    chainloader ${vtoy_path}/ventoy_x64.efi memdisk env_param=${env_param} dotefi isoefi=on ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size}
+    chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} dotefi isoefi=on ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size}

     boot
     
     if [ -n "$vtoy_dotefi_retry" ]; then
         unset vtoy_dotefi_retry
     boot
     
     if [ -n "$vtoy_dotefi_retry" ]; then
         unset vtoy_dotefi_retry

-        chainloader ${vtoy_iso_part}${vt_chosen_path}
+        chainloader "${vtoy_iso_part}${vt_chosen_path}"

         boot
     fi
     
         boot
     fi
     


@@ -1000,7 +1110,12 @@ function vhd_common_menuentry {
     fi
 
     vt_chosen_img_path vt_chosen_path vt_chosen_size
     fi
 
     vt_chosen_img_path vt_chosen_path vt_chosen_size

-    vt_patch_vhdboot $vt_chosen_path
+    
+    if vt_check_password "${vt_chosen_path}"; then
+        return
+    fi
+    
+    vt_patch_vhdboot "$vt_chosen_path"

     
     ventoy_debug_pause    
     
     
     ventoy_debug_pause    
     


@@ -1011,7 +1126,7 @@ function vhd_common_menuentry {
             boot
         else
             ventoy_cli_console
             boot
         else
             ventoy_cli_console

-            chainloader ${vtoy_path}/ventoy_x64.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size}
+            chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size}

             boot
             ventoy_gui_console
         fi        
             boot
             ventoy_gui_console
         fi        


@@ -1029,7 +1144,7 @@ function vtoyboot_common_func {
     set AltBootPart=0
     set vtoysupport=0
     
     set AltBootPart=0
     set vtoysupport=0
     

-    vt_get_vtoy_type ${1} vtoytype parttype AltBootPart
+    vt_get_vtoy_type "${1}" vtoytype parttype AltBootPart

     
     if vt_str_begin $vtoytype vhd; then    
         set vtoysupport=1
     
     if vt_str_begin $vtoytype vhd; then    
         set vtoysupport=1


@@ -1054,8 +1169,8 @@ function vtoyboot_common_func {
             fi
         fi
     
             fi
         fi
     

-        vt_img_sector ${1}
-        vt_raw_chain_data ${1}
+        vt_img_sector "${1}"
+        vt_raw_chain_data "${1}"

 
         ventoy_debug_pause
         
 
         ventoy_debug_pause
         


@@ -1065,9 +1180,9 @@ 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
                 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
                 ventoy_cli_console

-                chainloader ${vtoy_path}/ventoy_x64.efi sector512 env_param=${ventoy_env_param} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+                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
                 ventoy_gui_console
             fi  
                 boot
                 ventoy_gui_console
             fi  


@@ -1082,8 +1197,13 @@ function vtoyboot_common_func {
 }
 
 function vtoy_common_menuentry {    
 }
 
 function vtoy_common_menuentry {    

-    vt_chosen_img_path vt_chosen_path vt_chosen_size        
-    vtoyboot_common_func ${vtoy_iso_part}${vt_chosen_path}
+    vt_chosen_img_path vt_chosen_path vt_chosen_size     
+    
+    if vt_check_password "${vt_chosen_path}"; then
+        return
+    fi    
+    
+    vtoyboot_common_func "${vtoy_iso_part}${vt_chosen_path}"

 }
 
 function vtoy_unsupport_menuentry {
 }
 
 function vtoy_unsupport_menuentry {


@@ -1098,8 +1218,8 @@ function vtoy_unsupport_menuentry {
 
 
 function ventoy_img_easyos {
 
 
 function ventoy_img_easyos {

-    vt_load_cpio  $vtoy_path/ventoy.cpio  ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
-    vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit
+    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit

     
     loopback easysfs (vtimghd,1)/easy.sfs
     vt_get_lib_module_ver (easysfs) /lib/modules/ vt_module_ver
     
     loopback easysfs (vtimghd,1)/easy.sfs
     vt_get_lib_module_ver (easysfs) /lib/modules/ vt_module_ver


@@ -1124,8 +1244,8 @@ function ventoy_img_easyos {
 }
 
 function ventoy_img_volumio {
 }
 
 function ventoy_img_volumio {

-    vt_load_cpio  $vtoy_path/ventoy.cpio  ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
-    vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit
+    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit

 
     ventoy_debug_pause
 
 
     ventoy_debug_pause
 


@@ -1142,8 +1262,8 @@ function ventoy_img_volumio {
 function ventoy_img_openelec {
     elec_ver=$1
     
 function ventoy_img_openelec {
     elec_ver=$1
     

-    vt_load_cpio  $vtoy_path/ventoy.cpio  ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
-    vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit
+    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit

 
     loopback vtloopex $vtoy_efi_part/ventoy/vtloopex.cpio    
     vt_img_extra_initrd_append  (vtloopex)/$elec_ver/vtloopex.tar.xz
 
     loopback vtloopex $vtoy_efi_part/ventoy/vtloopex.cpio    
     vt_img_extra_initrd_append  (vtloopex)/$elec_ver/vtloopex.tar.xz


@@ -1164,8 +1284,8 @@ function ventoy_img_openelec {
 
 
 function ventoy_img_freedombox {
 
 
 function ventoy_img_freedombox {

-    vt_load_cpio  $vtoy_path/ventoy.cpio  ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
-    vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit
+    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit

 
     vt_get_lib_module_ver (vtimghd,1) /lib/modules/ vt_module_ver
     if [ -n "$vt_module_ver" ]; then        
 
     vt_get_lib_module_ver (vtimghd,1) /lib/modules/ vt_module_ver
     if [ -n "$vt_module_ver" ]; then        


@@ -1185,8 +1305,8 @@ function ventoy_img_freedombox {
 }
 
 function ventoy_img_paldo {
 }
 
 function ventoy_img_paldo {

-    vt_load_cpio  $vtoy_path/ventoy.cpio  ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
-    vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit
+    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit

 
     ventoy_debug_pause
 
 
     ventoy_debug_pause
 


@@ -1207,8 +1327,8 @@ function ventoy_img_paldo {
 }
 
 function ventoy_img_ubos {
 }
 
 function ventoy_img_ubos {

-    vt_load_cpio  $vtoy_path/ventoy.cpio  ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
-    vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit
+    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit

 
     vt_get_lib_module_ver (vtimghd,3) /lib/modules/ vt_module_ver
     if [ -n "$vt_module_ver" ]; then        
 
     vt_get_lib_module_ver (vtimghd,3) /lib/modules/ vt_module_ver
     if [ -n "$vt_module_ver" ]; then        


@@ -1231,8 +1351,8 @@ function ventoy_img_ubos {
 }
 
 function ventoy_img_recalbox {
 }
 
 function ventoy_img_recalbox {

-    vt_load_cpio  $vtoy_path/ventoy.cpio  ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
-    vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit
+    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit

 
     ventoy_debug_pause
 
 
     ventoy_debug_pause
 


@@ -1248,8 +1368,8 @@ function ventoy_img_recalbox {
 }
 
 function ventoy_img_batocera {
 }
 
 function ventoy_img_batocera {

-    vt_load_cpio  $vtoy_path/ventoy.cpio  ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
-    vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit
+    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit

 
     ventoy_debug_pause
 
 
     ventoy_debug_pause
 


@@ -1281,13 +1401,17 @@ function img_common_menuentry {
     set ventoy_busybox_ver=32
 
     vt_chosen_img_path vt_chosen_path vt_chosen_size
     set ventoy_busybox_ver=32
 
     vt_chosen_img_path vt_chosen_path vt_chosen_size

+    
+    if vt_check_password "${vt_chosen_path}"; then
+        return
+    fi

 
     if [ -d (vtimghd)/ ]; then
         loopback -d vtimghd
     fi
 
 
     if [ -d (vtimghd)/ ]; then
         loopback -d vtimghd
     fi
 

-    loopback vtimghd ${vtoy_iso_part}${vt_chosen_path}
-    vt_img_sector ${vtoy_iso_part}${vt_chosen_path}
+    loopback vtimghd "${vtoy_iso_part}${vt_chosen_path}"
+    vt_img_sector "${vtoy_iso_part}${vt_chosen_path}"

 
     vt_img_part_info (vtimghd)
 
 
     vt_img_part_info (vtimghd)
 


@@ -1310,15 +1434,15 @@ function img_common_menuentry {
         ventoy_img_easyos
     elif [ -e (vtimghd,1)/volumio.initrd ]; then
         ventoy_img_volumio
         ventoy_img_easyos
     elif [ -e (vtimghd,1)/volumio.initrd ]; then
         ventoy_img_volumio

-    elif vt_str_begin $vtImgHd1Label "LAKKA"; then
+    elif vt_str_begin "$vtImgHd1Label" "LAKKA"; then

         ventoy_img_openelec lakka
         ventoy_img_openelec lakka

-    elif vt_str_begin $vtImgHd1Label "LIBREELEC"; then
+    elif vt_str_begin "$vtImgHd1Label" "LIBREELEC"; then

         ventoy_img_openelec LibreELEC
         ventoy_img_openelec LibreELEC

-    elif vt_str_begin $vtImgHd1Label "paldo-live"; then
+    elif vt_str_begin "$vtImgHd1Label" "paldo-live"; then

         ventoy_img_paldo
         ventoy_img_paldo

-    elif vt_str_begin $vtImgHostname "freedombox"; then
+    elif vt_str_begin "$vtImgHostname" "freedombox"; then

         ventoy_img_freedombox
         ventoy_img_freedombox

-    elif vt_str_begin $vtImgHd1Label "BATOCERA"; then
+    elif vt_str_begin "$vtImgHd1Label" "BATOCERA"; then

         ventoy_img_batocera
     elif [ "$vtImgHd2Label" = "RECALBOX" ]; then
         ventoy_img_recalbox
         ventoy_img_batocera
     elif [ "$vtImgHd2Label" = "RECALBOX" ]; then
         ventoy_img_recalbox


@@ -1331,13 +1455,13 @@ function img_common_menuentry {
             ventoy_img_memtest86            
         fi
     else
             ventoy_img_memtest86            
         fi
     else

-        vt_linux_chain_data ${vtoy_iso_part}${vt_chosen_path}
+        vt_linux_chain_data "${vtoy_iso_part}${vt_chosen_path}"

         ventoy_acpi_param ${vtoy_chain_mem_addr} 512
         if [ "$grub_platform" = "pc" ]; then 
             linux16 $vtoy_path/ipxe.krn ${vtdebug_flag}  sector512  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}   
             boot
         else            
         ventoy_acpi_param ${vtoy_chain_mem_addr} 512
         if [ "$grub_platform" = "pc" ]; then 
             linux16 $vtoy_path/ipxe.krn ${vtdebug_flag}  sector512  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}   
             boot
         else            

-            chainloader ${vtoy_path}/ventoy_x64.efi sector512 env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+            chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi sector512 env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}

             boot
         fi
     fi
             boot
         fi
     fi


@@ -1360,7 +1484,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.28"
+set VENTOY_VERSION="1.0.33"

 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1


@@ -1381,8 +1505,17 @@ set VTOY_F6_CMD="ventoy_ext_menu"
 
 if [ "$grub_platform" = "pc" ]; then
     set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION BIOS  www.ventoy.net"
 
 if [ "$grub_platform" = "pc" ]; then
     set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION BIOS  www.ventoy.net"

-else
-    set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION UEFI  www.ventoy.net"
+else    
+    if [ "$grub_cpu" = "i386" ]; then
+        set VTOY_EFI_ARCH=ia32
+        set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION IA32  www.ventoy.net"
+    elif [ "$grub_cpu" = "arm64" ]; then
+        set VTOY_EFI_ARCH=aa64
+        set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION AA64  www.ventoy.net"
+    else
+        set VTOY_EFI_ARCH=x64
+        set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION UEFI  www.ventoy.net"    
+    fi

 fi
 
 vt_device $root  vtoy_dev
 fi
 
 vt_device $root  vtoy_dev


@@ -1424,7 +1557,9 @@ vt_load_part_table $vtoydev
 
 #Load Plugin
 if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then
 
 #Load Plugin
 if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then

+   clear

    vt_load_plugin $vtoy_iso_part
    vt_load_plugin $vtoy_iso_part

+   clear

 fi
 
 if [ -n "$VTOY_MENU_TIMEOUT" ]; then
 fi
 
 if [ -n "$VTOY_MENU_TIMEOUT" ]; then


@@ -1496,6 +1631,17 @@ if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then
     read vtInputKey 
 fi
 
     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
 #export necessary variable
 export theme
 export gfxmode


@@ -1507,6 +1653,7 @@ export vtoy_iso_part
 export vtoy_efi_part
 export VENTOY_VERSION
 export VTOY_CUR_VIDEO_MODE
 export vtoy_efi_part
 export VENTOY_VERSION
 export VTOY_CUR_VIDEO_MODE

+export VTOY_EFI_ARCH

 
 #special VTOY_DEFAULT_IMAGE process
 if [ -n "$VTOY_DEFAULT_IMAGE" ]; then
 
 #special VTOY_DEFAULT_IMAGE process
 if [ -n "$VTOY_DEFAULT_IMAGE" ]; then