]> glassweightruler.freedombox.rocks Git - Ventoy.git/blobdiff - INSTALL/grub/grub.cfg
projects / Ventoy.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
IA32 ARM64 support
[Ventoy.git] / INSTALL / grub / grub.cfg
diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 82fdbbbeb3cfbbfe0d2c7bc0d1b943580608811f..0540d462162a81619279932604ed33f5335b6784 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -200,7 +200,7 @@ function distro_specify_initrd_file {
     
     if [ "$vt_chosen_size" = "1133375488" ]; then
         if [ -d (loop)/boot/grub/x86_64-efi ]; then
-            vt_cpio_busybox64
+            vt_cpio_busybox64 "64h"
         fi
     fi
 }
@@ -256,7 +256,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    
-    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
@@ -314,6 +314,21 @@ function ventoy_get_freenas_ver {
     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
 }
@@ -325,6 +340,8 @@ function ventoy_freebsd_proc {
         ventoy_get_ghostbsd_ver "$1" "${chosen_path}"
     elif vt_strstr "$vt_volume_id" "FREENAS"; then
         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
         ventoy_get_furybsd_ver "$1" "${chosen_path}"  
     elif regexp "^13_[0-9]" "$vt_volume_id"; then
@@ -387,7 +404,7 @@ function ventoy_freebsd_proc {
     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
@@ -457,7 +474,7 @@ function uefi_windows_menu_func {
     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"
@@ -566,7 +583,7 @@ function uefi_linux_menu_func {
     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"
@@ -580,7 +597,7 @@ function uefi_unix_menu_func {
     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"
@@ -657,7 +674,7 @@ function uefi_iso_memdisk {
     vt_load_img_memdisk "${1}${2}" vtoy_iso_buf
     
     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
@@ -870,18 +887,23 @@ function iso_endless_os_proc {
 
 
 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
+            
         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
 }
 
@@ -892,12 +914,20 @@ function iso_common_menuentry {
     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
     
+    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
-    if vt_str_begin $vt_volume_id "Endless-OS"; 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
+    elif vt_str_begin "$vt_volume_id" "TENS-Public"; then
         set vtcompat=1
     fi
 
@@ -919,6 +949,10 @@ function iso_common_menuentry {
 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
@@ -948,6 +982,11 @@ function iso_unsupport_menuentry {
 
 function wim_common_menuentry {
     vt_chosen_img_path vt_chosen_path vt_chosen_size
+    
+    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
@@ -962,7 +1001,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
-            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
@@ -979,6 +1018,10 @@ function wim_unsupport_menuentry {
 function efi_common_menuentry {
     vt_chosen_img_path vt_chosen_path vt_chosen_size
     
+    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
@@ -986,7 +1029,7 @@ function efi_common_menuentry {
     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
@@ -1015,6 +1058,11 @@ function vhd_common_menuentry {
     fi
 
     vt_chosen_img_path vt_chosen_path vt_chosen_size
+    
+    if vt_check_password "${vt_chosen_path}"; then
+        return
+    fi
+    
     vt_patch_vhdboot "$vt_chosen_path"
     
     ventoy_debug_pause    
@@ -1026,7 +1074,7 @@ function vhd_common_menuentry {
             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        
@@ -1082,7 +1130,7 @@ function vtoyboot_common_func {
             else
                 ventoy_acpi_param ${vtoy_chain_mem_addr} 512
                 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  
@@ -1097,7 +1145,12 @@ function vtoyboot_common_func {
 }
 
 function vtoy_common_menuentry {    
-    vt_chosen_img_path vt_chosen_path vt_chosen_size        
+    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}"
 }
 
@@ -1296,6 +1349,10 @@ function img_common_menuentry {
     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
@@ -1352,7 +1409,7 @@ function img_common_menuentry {
             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
@@ -1375,7 +1432,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.29"
+set VENTOY_VERSION="1.0.30"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -1397,7 +1454,14 @@ set VTOY_F6_CMD="ventoy_ext_menu"
 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"
+    set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION UEFI  www.ventoy.net"    
+    if [ "$grub_cpu" = "i386" ]; then
+        set VTOY_EFI_ARCH=ia32
+    elif [ "$grub_cpu" = "arm64" ]; then
+        set VTOY_EFI_ARCH=aa64
+    else
+        set VTOY_EFI_ARCH=x64
+    fi
 fi
 
 vt_device $root  vtoy_dev
@@ -1439,6 +1503,7 @@ vt_load_part_table $vtoydev
 
 #Load Plugin
 if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then
+   clear
    vt_load_plugin $vtoy_iso_part
 fi
 
@@ -1522,6 +1587,7 @@ export vtoy_iso_part
 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
https://github.com/ventoy/Ventoy