X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/667f5bcc1b1510557d06a279beb49be5a8249e4a..ca07b52cb2f4798f4e72eed6187ae33e0c6ef585:/INSTALL/grub/grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 2ea2585..eb50e5c 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -130,9 +130,12 @@ function get_os_type {
 
 function vt_check_compatible_pe {
     #Check for PE without external tools
-    if [ -f "$1/HBCD_PE.ini" ]; then
+    #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 locate_initrd {
@@ -161,7 +164,11 @@ function distro_specify_wim_patch {
         vt_windows_collect_wim_patch wim /BOOT/H3_7PE.WIM
         vt_windows_collect_wim_patch wim /BOOT/H3_8PE.WIM
         vt_windows_collect_wim_patch wim /BOOT/H3_81PE.WIM
-    fi
+    elif [ -d (loop)/2k10/winpe ]; then
+        vt_windows_collect_wim_patch wim /2k10/winpe/w1086pe.wim
+        vt_windows_collect_wim_patch wim /2k10/winpe/w8x86pe.wim
+        vt_windows_collect_wim_patch wim /2k10/winpe/w7x86pe.wim
+    fi  
 }
 
 function distro_specify_wim_patch_phase2 {
@@ -550,6 +557,22 @@ function uefi_windows_menu_func {
     fi
 }
 
+function uefi_find_replace_initrd {
+    if vt_get_efi_vdisk_offset "${1}${2}" vt_efivdisk_offset; then
+        loopback -s $vt_efivdisk_offset vtefivdisk "${1}${2}"
+        
+        unset vt_rp_initrd
+        vt_search_replace_initrd (vtefivdisk) vt_rp_initrd
+        
+        if [ -n "$vt_rp_initrd" ]; then
+            vt_add_replace_file $3 "$vt_rp_initrd"
+        fi
+
+        loopback -d vtefivdisk
+        ventoy_debug_pause
+    fi
+}
+
 function uefi_linux_menu_func {
     
     if [ "$ventoy_compatible" = "NO" ]; then    
@@ -631,6 +654,11 @@ function uefi_linux_menu_func {
             elif [ -f (loop)/loader/entries/pisi-efi-x86_64.conf ]; then
                 vt_add_replace_file $vtindex "EFI\\pisi\\initrd.img"
             fi
+
+            vt_get_replace_file_cnt vt_replace_cnt
+            if [ $vt_replace_cnt -eq 0 ]; then
+                uefi_find_replace_initrd "$1" "$2" $vtindex
+            fi
         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"
@@ -638,6 +666,8 @@ function uefi_linux_menu_func {
                 vt_add_replace_file 0 "EFI\\hyperiso\\hyperiso.img"
             fi
         elif [ -d (loop)/EFI/BOOT/entries ]; then
+            vt_linux_get_main_initrd_index vtindex
+
             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
@@ -731,6 +761,8 @@ function ventoy_reset_nojoliet {
     else
         vt_iso9660_nojoliet 0
     fi
+    
+    vt_append_extra_sector 0
 }
 
 function uefi_iso_menu_func {
@@ -757,6 +789,12 @@ function uefi_iso_menu_func {
     else
         set ventoy_fs_probe=iso9660
         ventoy_reset_nojoliet
+
+        # Lenovo EasyStartup need an addional sector for boundary check
+        if vt_str_begin "$vt_volume_id" "EasyStartup"; then
+            vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}"
+            vt_append_extra_sector 1
+        fi
     fi
 
     loopback loop "${1}${chosen_path}"
@@ -900,7 +938,7 @@ function legacy_windows_menu_func {
             loopback loop "$1$2"
         fi
         
-        for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD"; do
+        for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD" "boot/bce"; do
             vt_windows_collect_wim_patch bcd (loop)/$file                
         done
         
@@ -940,6 +978,14 @@ function legacy_linux_menu_func {
             set ventoy_fs_probe=iso9660
             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
+        fi
     
         vt_load_cpio  $vtoy_path  "$2" "$1" "busybox=$ventoy_busybox_ver"
 
@@ -1399,7 +1445,7 @@ function vtoyboot_common_func {
                 ventoy_pause
             fi
         fi
-    
+
         vt_img_sector "${1}"
         vt_raw_chain_data "${1}"
 
@@ -1453,6 +1499,11 @@ function vtoy_unsupport_menuentry {
 #============================================================#
 #
 
+function only_uefi_tip {
+    echo -e "\n This IMG file is only supported in UEFI mode. \n"
+    echo -e "\n press ENTER to exit ..."
+    read vtInputKey 
+}
 
 function ventoy_img_easyos {
     vt_load_cpio  $vtoy_path  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
@@ -1626,14 +1677,25 @@ function ventoy_img_openwrt {
         set ventoy_busybox_ver=64
     fi
 
-    if [ ! -f ${vtoy_iso_part}/ventoy/ventoy_openwrt.xz ]; then
-        ventoy_gui_console
-        echo -e "\n ventoy_openwrt.xz not found. Please refer https://www.ventoy.net/en/doc_openwrt.html.\n"
-        echo -e " 未找到 ventoy_openwrt.xz 文件。请参考 https://www.ventoy.net/cn/doc_openwrt.html\n"
-        echo -e "\n press ENTER to exit (请按 回车 键返回) ..."
-        read vtInputKey
-        ventoy_cli_console
-        return
+    vt_fs_enum_1st_dir (vtimghd,2) /lib/modules/ vt_dir_name
+
+    if [ -f (vtimghd,2)/lib/modules/$vt_dir_name/dm-mod.ko ]; then
+        set openwrt_plugin_need=0
+        vt_img_extra_initrd_append  (vtimghd,2)/lib/modules/$vt_dir_name/dm-mod.ko
+        if [ -f (vtimghd,2)/lib/modules/$vt_dir_name/dax.ko ]; then
+            vt_img_extra_initrd_append  (vtimghd,2)/lib/modules/$vt_dir_name/dax.ko
+        fi
+    else
+        set openwrt_plugin_need=1
+        if [ ! -f ${vtoy_iso_part}/ventoy/ventoy_openwrt.xz ]; then
+            ventoy_gui_console
+            echo -e "\n ventoy_openwrt.xz not found. Please refer https://www.ventoy.net/en/doc_openwrt.html.\n"
+            echo -e " 未找到 ventoy_openwrt.xz 文件。请参考 https://www.ventoy.net/cn/doc_openwrt.html\n"
+            echo -e "\n press ENTER to exit (请按 回车 键返回) ..."
+            read vtInputKey
+            ventoy_cli_console
+            return
+        fi
     fi
 
     if vt_img_check_range "${vtoy_iso_part}${vt_chosen_path}"; then
@@ -1648,12 +1710,14 @@ function ventoy_img_openwrt {
         return
     fi
     
-
     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
 
-    vt_img_extra_initrd_append  ${vtoy_iso_part}/ventoy/ventoy_openwrt.xz
-    
+    if [ $openwrt_plugin_need -eq 1 ]; then
+        if [ -f ${vtoy_iso_part}/ventoy/ventoy_openwrt.xz ]; then
+            vt_img_extra_initrd_append  ${vtoy_iso_part}/ventoy/ventoy_openwrt.xz
+        fi
+    fi
 
     #boot image file
     vt_set_boot_opt rdinit=/vtoy/vtoy ventoyos=openwrt
@@ -1683,6 +1747,74 @@ function ventoy_img_tails {
     vt_unset_boot_opt
 }
 
+function ventoy_img_fydeos {
+    if [ "$grub_platform" = "pc" ]; then
+        only_uefi_tip
+        return
+    fi
+
+    vt_load_cpio  $vtoy_path  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=64"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit
+
+    ventoy_debug_pause
+
+    #boot image file
+    vt_set_boot_opt rdinit=/vtoy/vtoy ventoyos=fydeos
+    vt_img_hook_root
+
+    set grubdisk=vtimghd
+    set grubpartA=(vtimghd,3)
+    set grubpartB=(vtimghd,5)
+    set linuxpartA=(sda,3)
+    set linuxpartB=(sda,5)
+
+    set root=(vtimghd,12)
+    configfile (vtimghd,12)/efi/boot/grub.cfg
+
+    vt_img_unhook_root
+    vt_unset_boot_opt
+    
+    unset grubdisk
+    unset grubpartA
+    unset grubpartB
+    unset linuxpartA
+    unset linuxpartB
+}
+
+function ventoy_img_cloudready {
+    if [ "$grub_platform" = "pc" ]; then
+        only_uefi_tip
+        return
+    fi
+
+    vt_load_cpio  $vtoy_path  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=64"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit
+
+    ventoy_debug_pause
+
+    #boot image file
+    vt_set_boot_opt rdinit=/vtoy/vtoy ventoyos=cloudready
+    vt_img_hook_root
+
+    set grubdisk=vtimghd
+    set grubpartA=(vtimghd,3)
+    set grubpartB=(vtimghd,5)
+    set linuxpartA=(sda,3)
+    set linuxpartB=(sda,5)
+
+    set root=(vtimghd,12)    
+    configfile (vtimghd,12)/efi/boot/grub.cfg
+
+    vt_img_unhook_root
+    vt_unset_boot_opt
+    
+    unset grubdisk
+    unset grubpartA
+    unset grubpartB
+    unset linuxpartA
+    unset linuxpartB
+}
+
 function ventoy_img_memtest86 {      
     chainloader (vtimghd,1)/efi/boot/BOOTX64.efi
     boot
@@ -1695,9 +1827,19 @@ function img_unsupport_tip {
     read vtInputKey 
 }
 
+function legacy_img_memdisk {
+    linux16   $vtoy_path/memdisk
+    echo "Loading img file to memory ..."
+    initrd16  "${1}${2}"
+    
+    ventoy_cli_console
+    boot
+}
+
 function img_common_menuentry {
     set ventoy_compatible=YES
     set ventoy_busybox_ver=32
+    unset LoadIsoEfiDriver
 
     vt_chosen_img_path vt_chosen_path vt_chosen_size
     
@@ -1709,8 +1851,11 @@ function img_common_menuentry {
         return
     fi
 
-    if [ -d (vtimghd)/ ]; then
-        loopback -d vtimghd
+    if [ "$grub_platform" = "pc" ]; then
+        if vt_check_mode 0; then
+            legacy_img_memdisk $vtoy_iso_part "$vt_chosen_path"
+            return
+        fi
     fi
 
     loopback vtimghd "${vtoy_iso_part}${vt_chosen_path}"
@@ -1728,19 +1873,26 @@ function img_common_menuentry {
 
 
     vt_get_fs_label (vtimghd,1) vtImgHd1Label
-    if [ -d (vtimghd,2)/lib ]; then        
+
+    if [ "$vtImgHd1Label" = "STATE" ]; then
+        vt_get_fs_label (vtimghd,3) vtImgHd3Label
+    elif [ -d (vtimghd,2)/lib ]; then
         vt_get_fs_label (vtimghd,2) vtImgHd2Label
     fi
-    
+
     if [ -e (vtimghd,1)/etc/hostname ]; then
         vt_1st_line (vtimghd,1)/etc/hostname vtImgHostname
     fi
-    
-    
-    if [ -e (vtimghd,1)/easy.sfs ]; then
-        ventoy_img_easyos
-    elif [ -e (vtimghd,1)/volumio.initrd ]; then
-        ventoy_img_volumio
+
+    if vt_str_begin "$vtImgHd3Label" "ROOT-"; then
+        if [ -f (vtimghd,3)/etc/os-release.d/ID ]; then 
+            vt_1st_line (vtimghd,3)/etc/os-release.d/ID vt_release_line1
+            if [ vt_str_begin "$vt_release_line1" "FydeOS" ]; then
+                ventoy_img_fydeos
+            fi
+        elif [ -f (vtimghd,3)/etc/cloudready-release ]; then
+            ventoy_img_cloudready
+        fi
     elif vt_str_begin "$vtImgHd1Label" "LAKKA"; then
         ventoy_img_openelec lakka
     elif vt_str_begin "$vtImgHd1Label" "LIBREELEC"; then
@@ -1755,6 +1907,10 @@ function img_common_menuentry {
         ventoy_img_tails
     elif [ "$vtImgHd2Label" = "RECALBOX" ]; then
         ventoy_img_recalbox
+    elif [ -e (vtimghd,1)/easy.sfs ]; then
+        ventoy_img_easyos
+    elif [ -e (vtimghd,1)/volumio.initrd ]; then
+        ventoy_img_volumio
     elif [ -f (vtimghd,2)/loader/entries/ubos.conf ]; then
         ventoy_img_ubos
     elif [ -f (vtimghd,2)/etc/openwrt_version ]; then
@@ -1764,7 +1920,7 @@ function img_common_menuentry {
             img_unsupport_tip
         else
             ventoy_img_memtest86            
-        fi
+        fi    
     else
         vt_linux_chain_data "${vtoy_iso_part}${vt_chosen_path}"
         ventoy_acpi_param ${vtoy_chain_mem_addr} 512
@@ -1777,6 +1933,8 @@ function img_common_menuentry {
         fi
     fi
 
+    loopback -d vtimghd
+
     set root=$vtback_root
     vt_pop_last_entry
     set theme=$vtback_theme
@@ -1796,7 +1954,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.46"
+set VENTOY_VERSION="1.0.51"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -1874,9 +2032,11 @@ vt_load_part_table $vtoydev
 
 #Load Plugin
 if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then
-   clear
-   vt_load_plugin $vtoy_iso_part
-   clear
+    clear
+    vt_load_plugin $vtoy_iso_part
+    clear
+else
+    vt_check_json_path_case $vtoy_iso_part
 fi
 
 if [ -n "$VTOY_MENU_TIMEOUT" ]; then
@@ -1943,6 +2103,15 @@ if [ -n "$VTOY_DEFAULT_KBD_LAYOUT" ]; then
     set_keyboard_layout "$VTOY_DEFAULT_KBD_LAYOUT"
 fi
 
+if [ -n "$VTOY_PLUGIN_PATH_CASE_MISMATCH" ]; then
+    clear
+    echo "$VTOY_PLUGIN_PATH_CASE_MISMATCH"
+    echo -e "\n\nPath case does not match! ventoy directory and ventoy.json MUST be all lowercase!"
+    echo -e "\n路径大小写不匹配！ventoy 目录和 ventoy.json 文件的名字必须是全部小写，请修正！"
+    echo -e "\n\npress ENTER to continue (请按回车键继续) ..."
+    read vtInputKey
+fi
+
 if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then
     clear
     echo -e "\n Syntax error detected in ventoy.json, please check! \n"