1.0.49 release

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 10270ead0e7aa9c700297249d6bd16b83b16afed..284cce0807df47ac755811dafb8682c0c7f9c82d 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -159,7 +159,7 @@ 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
+    fi    
 }
 
 function distro_specify_wim_patch_phase2 {
@@ -548,6 +548,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    
@@ -629,6 +645,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"
@@ -900,7 +921,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
         
@@ -1823,7 +1844,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.46"
+set VENTOY_VERSION="1.0.49"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1