X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/092cff8429e69b70b65845c1b18715262a84e0fe..07d4140cf45c2fb7f9d4f5823b2bd8d73626dfc9:/INSTALL/grub/grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index df8d856..a447747 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -638,6 +638,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
@@ -1399,7 +1401,7 @@ function vtoyboot_common_func {
                 ventoy_pause
             fi
         fi
-    
+
         vt_img_sector "${1}"
         vt_raw_chain_data "${1}"
 
@@ -1627,13 +1629,15 @@ function ventoy_img_openwrt {
     fi
 
     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"
@@ -1657,12 +1661,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