diff --git a/.github/ISSUE_TEMPLATE/issue_template.yml b/.github/ISSUE_TEMPLATE/issue_template.yml index 7d4510d5..8099da83 100644 --- a/.github/ISSUE_TEMPLATE/issue_template.yml +++ b/.github/ISSUE_TEMPLATE/issue_template.yml @@ -21,7 +21,7 @@ body: attributes: label: Ventoy Version description: What version of ventoy are you running? - placeholder: 1.0.56 + placeholder: 1.0.57 validations: required: true - type: dropdown diff --git a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c index 3a47de6a..77c833ce 100644 --- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c +++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c @@ -2376,7 +2376,11 @@ static int ventoy_parse_plugin_config(VTOY_JSON *json, const char *isodisk) break; } } - + } + + + for (cur = json; cur; cur = cur->pstNext) + { for (i = 0; i < (int)ARRAY_SIZE(g_plugin_entries); i++) { if (g_plugin_entries[i].flag == 0 && grub_strcmp(g_plugin_entries[i].key, cur->pcName) == 0) @@ -3180,7 +3184,7 @@ grub_err_t ventoy_cmd_plugin_check_json(grub_extcmd_context_t ctxt, int argc, ch grub_snprintf(key, sizeof(key), "%s_%s", args[1], g_arch_mode_suffix); for (node = json->pstChild; node; node = node->pstNext) { - if (grub_strcmp(node->pcName, args[1]) == 0 || grub_strcmp(node->pcName, key) == 0) + if (grub_strcmp(node->pcName, key) == 0) { break; } @@ -3188,8 +3192,19 @@ grub_err_t ventoy_cmd_plugin_check_json(grub_extcmd_context_t ctxt, int argc, ch if (!node) { - grub_printf("%s is NOT found in ventoy.json\n", args[1]); - goto end; + for (node = json->pstChild; node; node = node->pstNext) + { + if (grub_strcmp(node->pcName, args[1]) == 0) + { + break; + } + } + + if (!node) + { + grub_printf("%s is NOT found in ventoy.json\n", args[1]); + goto end; + } } for (i = 0; i < (int)ARRAY_SIZE(g_plugin_entries); i++) diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index 188fdefb..c108d60a 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -355,6 +355,8 @@ function distro_specify_initrd_file_phase2 { vt_linux_specify_initrd_file /porteus/initrd.xz elif [ -f (loop)/pyabr/boot/initrfs.img ]; then vt_linux_specify_initrd_file /pyabr/boot/initrfs.img + elif [ -f (loop)/initrd0.img ]; then + vt_linux_specify_initrd_file /initrd0.img fi } @@ -2009,7 +2011,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.56" +set VENTOY_VERSION="1.0.57" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1