X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/c5af17e04e5f0ca61a38247f2216ba3fae178527..c2cc0bd3dca23519f59565bc4e69fb5c92d3bb0f:/INSTALL/grub/grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 45694c7..d84a9d3 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -90,6 +90,28 @@ function ventoy_ext_menu {
     fi
 }
 
+function ventoy_checksum {
+    if [ -f "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}" ]; then
+        configfile $prefix/checksum.cfg
+    fi
+}
+
+function ventoy_show_help {
+    if [ -f $prefix/help.tar.gz ]; then
+        if [ -z "$vtoy_help_txt_mem_addr" ]; then
+            vt_load_file_to_mem "auto" $prefix/help.tar.gz vtoy_help_txt_mem
+        fi
+
+        loopback vt_help_tarfs mem:${vtoy_help_txt_mem_addr}:size:${vtoy_help_txt_mem_size}
+        if [ -f "(vt_help_tarfs)/help/${VTOY_HELP_TXT_LANGUAGE}.txt" ]; then
+            cat "(vt_help_tarfs)/help/${VTOY_HELP_TXT_LANGUAGE}.txt"
+        else
+            cat "(vt_help_tarfs)/help/en_US.txt"
+        fi        
+        loopback -d vt_help_tarfs
+    fi
+}
+
 function get_os_type {
     set vtoy_os=Linux
     
@@ -107,6 +129,9 @@ function get_os_type {
         elif [ -e (loop)/bin/freebsd-version ]; then
             set vtoy_os=Unix
             set vt_unix_type=FreeBSD
+        elif [ -e (loop)/boot/kernel/geom_ventoy.ko ]; 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
@@ -132,6 +157,16 @@ function vt_check_compatible_pe {
     #Check for PE without external tools
     #set compatible if ISO file is less than 80MB
     if [ $vt_chosen_size -gt 33554432 -a $vt_chosen_size -le 83886080 ]; then
+        set ventoy_compatible=YES    
+    fi
+
+    return
+}
+
+function vt_check_compatible_linux {
+    if vt_str_begin "$vt_volume_id" "embootkit"; then
+        set ventoy_compatible=YES
+    elif [ -e "$1/casper/tinycore.gz" ]; then
         set ventoy_compatible=YES
     fi
 
@@ -201,6 +236,8 @@ function distro_specify_initrd_file {
         vt_linux_specify_initrd_file /initrd.gz
     elif [ -e (loop)/slax/boot/initrfs.img ]; then
         vt_linux_specify_initrd_file /slax/boot/initrfs.img
+    elif [ -e (loop)/minios/boot/initrfs.img ]; then
+        vt_linux_specify_initrd_file /minios/boot/initrfs.img
     elif [ -e (loop)/pmagic/initrd.img ]; then
         vt_linux_specify_initrd_file /pmagic/initrd.img
     elif [ -e (loop)/boot/initrd.xz ]; then
@@ -215,7 +252,8 @@ function distro_specify_initrd_file {
         vt_linux_specify_initrd_file /boot/initramfs-x86_64.img
     elif [ -f (loop)/boot/isolinux/initramfs_data64.cpio.gz ]; then 
         vt_linux_specify_initrd_file /boot/isolinux/initramfs_data64.cpio.gz
-
+    elif [ -f (loop)/boot/initrd.img ]; then 
+        vt_linux_specify_initrd_file /boot/initrd.img
         
     fi
     
@@ -320,6 +358,10 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /360Disk/initrd.gz
     elif [ -f (loop)/porteus/initrd.xz ]; then
         vt_linux_specify_initrd_file /porteus/initrd.xz
+    elif [ -f (loop)/pyabr/boot/initrfs.img ]; then
+        vt_linux_specify_initrd_file /pyabr/boot/initrfs.img
+    elif [ -f (loop)/initrd0.img ]; then
+        vt_linux_specify_initrd_file /initrd0.img
     
     fi
 }
@@ -381,6 +423,11 @@ function ventoy_freebsd_proc {
     set vtFreeBsdDistro=FreeBSD
     set vt_freebsd_ver=xx
 
+    if [ -e (loop)/boot/kernel/geom_ventoy.ko ]; then
+        vt_unix_ko_fillmap /boot/kernel/geom_ventoy.ko
+        return
+    fi
+
     if vt_strstr "$vt_volume_id" "GHOSTBSD"; then
         ventoy_get_ghostbsd_ver "$1" "${chosen_path}"
     elif vt_strstr "$vt_volume_id" "FREENAS"; then
@@ -676,7 +723,9 @@ function uefi_linux_menu_func {
         elif [ -e (loop)/syslinux/alt0/full.cz ]; then
             vt_add_replace_file 0 "EFI\\BOOT\\full.cz"            
             set FirstTryBootFile='@EFI@BOOT@grubx64.efi'
-
+            
+        elif vt_str_begin "$vt_volume_id" "SolusLive"; then
+            vt_add_replace_file 0 "initrd"
 
         fi
         
@@ -829,6 +878,7 @@ function uefi_iso_menu_func {
     elif [ "$vtoy_os" = "Unix" ]; then
         uefi_unix_menu_func "$1" "${chosen_path}"
     else
+        vt_check_compatible_linux (loop)
         uefi_linux_menu_func  "$1" "${chosen_path}"
     fi
 
@@ -979,14 +1029,13 @@ function legacy_linux_menu_func {
             loopback loop "$1$2"
         fi
 
-        if [ -f (loop)/isolinux/isolinux.cfg ]; then
-            if vt_iso9660_isjoliet; then
-                vt_iso9660_nojoliet 1
-                loopback -d loop
-                loopback loop "$1$2"
-            fi
+        
+        if vt_syslinux_need_nojoliet "$1$2"; then
+            vt_iso9660_nojoliet 1
+            loopback -d loop
+            loopback loop "$1$2"
         fi
-    
+
         vt_load_cpio  $vtoy_path  "$2" "$1" "busybox=$ventoy_busybox_ver"
 
         vt_linux_clear_initrd
@@ -1066,7 +1115,7 @@ function legacy_linux_menu_func {
             ventoy_gui_console
         else
             ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
-            linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+            linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}            
             boot
         fi
     else
@@ -1133,6 +1182,7 @@ function legacy_iso_menu_func {
     elif [ "$vtoy_os" = "Unix" ]; then
         legacy_unix_menu_func "$1" "${chosen_path}"
     else
+        vt_check_compatible_linux (loop)
         legacy_linux_menu_func  "$1" "${chosen_path}"
     fi
 }
@@ -1215,9 +1265,8 @@ function iso_common_menuentry {
             echo -e "\n $vt_volume_space $vt_chosen_size $vt_chosen_size_mod\n"
             echo -e "\n The size of the iso file \"$vt_chosen_size\" is invalid. File corrupted ?\n"
             echo -e " 此ISO文件的大小 \"$vt_chosen_size\" 有问题，请确认文件是否损坏。\n"
-            echo -e "\n press ENTER to exit (请按 回车 键返回) ..."
+            echo -e "\n press ENTER to continue (请按 回车 键继续) ..."
             read vtInputKey
-            return
         fi
     fi
     
@@ -1501,8 +1550,7 @@ function vtoy_unsupport_menuentry {
 
 function only_uefi_tip {
     echo -e "\n This IMG file is only supported in UEFI mode. \n"
-    echo -e " 此 IMG 文件只支持在 UEFI 模式下启动。\n"
-    echo -e "\npress ENTER to exit (请按 回车 键返回) ..."    
+    echo -e "\n press ENTER to exit ..."
     read vtInputKey 
 }
 
@@ -1656,6 +1704,23 @@ function ventoy_img_recalbox {
     vt_unset_boot_opt
 }
 
+function ventoy_img_esysrescue {
+    vt_load_cpio  $vtoy_path  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit
+
+    ventoy_debug_pause
+
+    #boot image file
+    vt_set_boot_opt rdinit=/vtoy/vtoy ventoyos=esysrescue
+    vt_img_hook_root
+
+    set root=(vtimghd,1)
+    configfile (vtimghd,1)/boot/grub/grub.cfg
+
+    vt_img_unhook_root
+    vt_unset_boot_opt
+}
+
 function ventoy_img_batocera {
     vt_load_cpio  $vtoy_path  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
     vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit
@@ -1908,6 +1973,8 @@ function img_common_menuentry {
         ventoy_img_tails
     elif [ "$vtImgHd2Label" = "RECALBOX" ]; then
         ventoy_img_recalbox
+    elif [ "$vtImgHd1Label" = "ESYSRESCUE" ]; then
+        ventoy_img_esysrescue
     elif [ -e (vtimghd,1)/easy.sfs ]; then
         ventoy_img_easyos
     elif [ -e (vtimghd,1)/volumio.initrd ]; then
@@ -1955,7 +2022,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.51"
+set VENTOY_VERSION="1.0.64"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -1975,6 +2042,11 @@ set VTOY_F2_CMD="ventoy_power"
 set VTOY_F4_CMD="ventoy_localboot"
 set VTOY_F5_CMD="ventoy_diagnosis"
 set VTOY_F6_CMD="ventoy_ext_menu"
+set VTOY_HELP_CMD="ventoy_show_help"
+set VTOY_CHKSUM_CMD="ventoy_checksum"
+set VTOY_HELP_TXT_LANGUAGE="en_US"
+set VTOY_CHKSUM_FILE_PATH="X"
+
 
 if [ "$grub_platform" = "pc" ]; then
     set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION BIOS  www.ventoy.net"
@@ -2024,7 +2096,10 @@ else
     set vtoydev=$vtoy_dev
     set vtoy_iso_part=($vtoy_dev,1)
     set vtoy_efi_part=($vtoy_dev,2)
-    loadfont unicode
+    
+    vt_load_file_to_mem "auto" $prefix/fonts/unicode.pf2 vtoy_font_mem
+    loadfont mem:${vtoy_font_mem_addr}:size:${vtoy_font_mem_size}
+
     set vt_plugin_path=$vtoy_iso_part
 fi
 
@@ -2061,10 +2136,10 @@ fi
 
 if [ $VTOY_DEFAULT_MENU_MODE -eq 0 ]; then
     set VTOY_F3_CMD="vt_dynamic_menu 1 1"
-    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:TreeView  F4:Localboot  F5:Tools  F6:ExMenu"
+    set VTOY_HOTKEY_TIP="h:Help  F1:Memdisk  F2:Power  F3:TreeView  F4:Localboot  F5:Tools  F6:ExMenu"
 else
     set VTOY_F3_CMD="vt_dynamic_menu 1 0"
-    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:ListView  F4:Localboot  F5:Tools  F6:ExMenu"
+    set VTOY_HOTKEY_TIP="h:Help  F1:Memdisk  F2:Power  F3:ListView  F4:Localboot  F5:Tools  F6:ExMenu"
 fi
 
 
@@ -2115,12 +2190,19 @@ fi
 
 if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then
     clear
-    echo -e "\n Syntax error detected in ventoy.json, please check! \n"
-    echo -e " ventoy.json 文件中有语法错误，所有配置都不会生效，请检查！\n"
+    if [ -n "$VTOY_PLUGIN_ENCODE_ERROR" ]; then
+        echo -e "\n Encoding type for ventoy.json is not supported, please convert to UTF-8.\n"
+        echo -e " ventoy.json 文件编码格式不支持，请转换为 UTF-8 编码格式！\n"
+    else
+        echo -e "\n Syntax error detected in ventoy.json, please check! \n"
+        echo -e " ventoy.json 文件中有语法错误，所有配置都不会生效，请检查！\n"         
+    fi
+
     echo -e "\n press ENTER to continue (请按 回车 键继续) ..."
-    read vtInputKey 
+    read vtInputKey
 fi
 
+
 for vtTFile in ventoy.json ventoy_grub.cfg; do
     if [ -f $vtoy_efi_part/ventoy/$vtTFile ]; then
         clear
@@ -2152,6 +2234,14 @@ export VTOY_ISO_RAW_STR
 export VTOY_GRUB2_MODE_STR
 export VTOY_WIMBOOT_MODE_STR
 export VTOY_ISO_UEFI_DRV_STR
+export VTOY_F2_CMD
+export VTOY_F4_CMD
+export VTOY_F5_CMD
+export VTOY_F6_CMD
+export VTOY_HELP_CMD
+export VTOY_CHKSUM_CMD
+export VTOY_HELP_TXT_LANGUAGE
+export VTOY_CHKSUM_FILE_PATH
 
 
 #special VTOY_DEFAULT_IMAGE process