bug fix

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 2d2498b00d39f9335ebe0e5c263932cd1f2a11eb..83f0e6b44446f0343aa7a3483adb2718df9de286 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -185,7 +185,7 @@ function locate_initrd {
 }
 
 function locate_wim {
 }
 
 function locate_wim {

-    vt_windows_locate_wim_patch (loop)
+    vt_windows_locate_wim_patch (loop) "$1"

     
     if [ -n "${vtdebug_flag}" ]; then
         echo '###############################################'
     
     if [ -n "${vtdebug_flag}" ]; then
         echo '###############################################'


@@ -381,7 +381,9 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /sysresccd/boot/i686/sysresccd.img
     elif [ -f (loop)/boot/full.cz ]; then
         vt_linux_specify_initrd_file /boot/full.cz
         vt_linux_specify_initrd_file /sysresccd/boot/i686/sysresccd.img
     elif [ -f (loop)/boot/full.cz ]; then
         vt_linux_specify_initrd_file /boot/full.cz

-    
+    elif [ -f (loop)/images/pxeboot/initrd.img ]; then
+        vt_linux_specify_initrd_file /images/pxeboot/initrd.img
+

     fi
 }
 
     fi
 }
 


@@ -615,13 +617,13 @@ function uefi_windows_menu_func {
         fi
         
         ventoy_debug_pause        
         fi
         
         ventoy_debug_pause        

-        locate_wim
+        locate_wim "${chosen_path}"

     fi
 
     vt_windows_chain_data "${1}${chosen_path}"
     ventoy_debug_pause
     
     fi
 
     vt_windows_chain_data "${1}${chosen_path}"
     ventoy_debug_pause
     

-    if vt_check_mode 4; then
+    if vt_check_mode 4 "$vt_chosen_name"; then

         vtoy_windows_wimboot_func
     fi
     
         vtoy_windows_wimboot_func
     fi
     


@@ -779,7 +781,7 @@ function uefi_linux_menu_func {
         ventoy_cli_console     
 
         unset vtGrub2Mode
         ventoy_cli_console     
 
         unset vtGrub2Mode

-        if vt_check_mode 3; then
+        if vt_check_mode 3 "$vt_chosen_name"; then

             set vtGrub2Mode=1
         elif vt_str_begin "$vt_volume_id" "KRD"; then
             if [ -f (loop)/boot/grub/grub.cfg.sig ]; then
             set vtGrub2Mode=1
         elif vt_str_begin "$vt_volume_id" "KRD"; then
             if [ -f (loop)/boot/grub/grub.cfg.sig ]; then


@@ -867,7 +869,7 @@ function uefi_iso_menu_func {
     if [ -n "$vtisouefi" ]; then
         set LoadIsoEfiDriver=on
         unset vtisouefi
     if [ -n "$vtisouefi" ]; then
         set LoadIsoEfiDriver=on
         unset vtisouefi

-    elif vt_check_mode 2; then
+    elif vt_check_mode 2 "$vt_chosen_name"; then

         set LoadIsoEfiDriver=on
     else
         unset LoadIsoEfiDriver
         set LoadIsoEfiDriver=on
     else
         unset LoadIsoEfiDriver


@@ -904,7 +906,7 @@ function uefi_iso_menu_func {
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat

-    elif vt_check_mode 1; then
+    elif vt_check_mode 1 "$vt_chosen_name"; then

         set ventoy_compatible=YES
     else
         vt_check_compatible (loop)        
         set ventoy_compatible=YES
     else
         vt_check_compatible (loop)        


@@ -1044,13 +1046,13 @@ function legacy_windows_menu_func {
         fi
         
         ventoy_debug_pause        
         fi
         
         ventoy_debug_pause        

-        locate_wim
+        locate_wim "${chosen_path}"

     fi
 
     vt_windows_chain_data "${1}${chosen_path}"
     ventoy_debug_pause    
 
     fi
 
     vt_windows_chain_data "${1}${chosen_path}"
     ventoy_debug_pause    
 

-    if vt_check_mode 4; then
+    if vt_check_mode 4 "$vt_chosen_name"; then

         vtoy_windows_wimboot_func
     fi
 
         vtoy_windows_wimboot_func
     fi
 


@@ -1133,7 +1135,7 @@ function legacy_linux_menu_func {
     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then

-        if vt_check_mode 3; then
+        if vt_check_mode 3 "$vt_chosen_name"; then

             ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
             ventoy_cli_console
         
             ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
             ventoy_cli_console
         


@@ -1212,7 +1214,7 @@ function legacy_iso_menu_func {
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat

-    elif vt_check_mode 1; then
+    elif vt_check_mode 1 "$vt_chosen_name"; then

         set ventoy_compatible=YES
     else
         vt_check_compatible (loop)
         set ventoy_compatible=YES
     else
         vt_check_compatible (loop)


@@ -1343,7 +1345,7 @@ function iso_common_menuentry {
     # auto memdisk mode for some special ISO files
     vt_iso_vd_id_parse "${vtoy_iso_part}${vt_chosen_path}"    
     unset vtMemDiskBoot
     # auto memdisk mode for some special ISO files
     vt_iso_vd_id_parse "${vtoy_iso_part}${vt_chosen_path}"    
     unset vtMemDiskBoot

-    if vt_check_mode 0; then
+    if vt_check_mode 0 "$vt_chosen_name"; then

         set vtMemDiskBoot=1
     else
         if [ "$grub_platform" = "pc" ]; then
         set vtMemDiskBoot=1
     else
         if [ "$grub_platform" = "pc" ]; then


@@ -1380,7 +1382,7 @@ function iso_common_menuentry {
 }
 
 function miso_common_menuentry {
 }
 
 function miso_common_menuentry {

-    vt_chosen_img_path vt_chosen_path vt_chosen_size
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name

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


@@ -1414,7 +1416,7 @@ function iso_unsupport_menuentry {
 }
 
 function wim_common_menuentry {
 }
 
 function wim_common_menuentry {

-    vt_chosen_img_path vt_chosen_path vt_chosen_size
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name

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


@@ -1453,7 +1455,7 @@ function wim_unsupport_menuentry {
 }
 
 function efi_common_menuentry {
 }
 
 function efi_common_menuentry {

-    vt_chosen_img_path vt_chosen_path vt_chosen_size
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name

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


@@ -1523,7 +1525,7 @@ function vhdboot_common_func {
 }
 
 function vhd_common_menuentry {
 }
 
 function vhd_common_menuentry {

-    vt_chosen_img_path vt_chosen_path vt_chosen_size
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name

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


@@ -1620,7 +1622,7 @@ function vtoyboot_common_func {
 }
 
 function vtoy_common_menuentry {    
 }
 
 function vtoy_common_menuentry {    

-    vt_chosen_img_path vt_chosen_path vt_chosen_size     
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name

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


@@ -2030,7 +2032,7 @@ function img_common_menuentry {
     set ventoy_busybox_ver=32
     unset LoadIsoEfiDriver
 
     set ventoy_busybox_ver=32
     unset LoadIsoEfiDriver
 

-    vt_chosen_img_path vt_chosen_path vt_chosen_size
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name

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


@@ -2041,7 +2043,7 @@ function img_common_menuentry {
     fi
 
     if [ "$grub_platform" = "pc" ]; then
     fi
 
     if [ "$grub_platform" = "pc" ]; then

-        if vt_check_mode 0; then
+        if vt_check_mode 0 "$vt_chosen_name"; then

             legacy_img_memdisk $vtoy_iso_part "$vt_chosen_path"
             return
         fi
             legacy_img_memdisk $vtoy_iso_part "$vt_chosen_path"
             return
         fi


@@ -2076,11 +2078,15 @@ function img_common_menuentry {
     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 "$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
+            if vt_str_begin "$vt_release_line1" "FydeOS"; then

                 ventoy_img_fydeos
                 ventoy_img_fydeos

+            else
+                ventoy_img_cloudready

             fi
         elif [ -f (vtimghd,3)/etc/cloudready-release ]; then
             ventoy_img_cloudready
             fi
         elif [ -f (vtimghd,3)/etc/cloudready-release ]; then
             ventoy_img_cloudready

+        elif [ -f (vtimghd,3)/etc/chrome_dev.conf ]; then
+            ventoy_img_cloudready

         fi
     elif vt_str_begin "$vtImgHd1Label" "LAKKA"; then
         ventoy_img_openelec lakka
         fi
     elif vt_str_begin "$vtImgHd1Label" "LAKKA"; then
         ventoy_img_openelec lakka


@@ -2145,7 +2151,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.75"
+set VENTOY_VERSION="1.0.79"

 
 #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