From 07d4140cf45c2fb7f9d4f5823b2bd8d73626dfc9 Mon Sep 17 00:00:00 2001 From: longpanda Date: Fri, 9 Jul 2021 17:35:19 +0800 Subject: [PATCH] Optimization for booting openwrt --- INSTALL/grub/grub.cfg | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index 6c3c10d4..a4477474 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -1401,7 +1401,7 @@ function vtoyboot_common_func { ventoy_pause fi fi - + vt_img_sector "${1}" vt_raw_chain_data "${1}" @@ -1629,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" @@ -1659,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