MyFavMirrors/Ventoy
1
0
Fork 0
mirror of https://github.com/ventoy/Ventoy.git synced 2024-12-27 07:35:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug about ventoy version message position when VTOY_DEFAULT_IMG is set to F6>xxx

Browse Source
This commit is contained in:
longpanda 2021-06-09 20:55:45 +08:00
parent b5eb347244
commit 3e47f5e8de
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
View File

@ -1047,5 +1047,11 @@ int ventoy_chain_file_read(const char *path, int offset, int len, void *buf);
#define vtoy_theme_random_boot_day 1 #define vtoy_theme_random_boot_day 1
#define vtoy_theme_random_boot_month 2 #define vtoy_theme_random_boot_month 2
#define ventoy_env_export(env, name) \
{\
grub_env_set((env), (name));\
grub_env_export(env);\
}
#endif /* __VENTOY_DEF_H__ */ #endif /* __VENTOY_DEF_H__ */

16
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
View File

@ -304,7 +304,7 @@ static int ventoy_plugin_theme_entry(VTOY_JSON *json, const char *isodisk)
} }
debug("vtoy_theme %s\n", filepath); debug("vtoy_theme %s\n", filepath);
grub_env_set("vtoy_theme", filepath); ventoy_env_export("vtoy_theme", filepath);
grub_snprintf(g_theme_single_file, sizeof(g_theme_single_file), "%s", filepath); grub_snprintf(g_theme_single_file, sizeof(g_theme_single_file), "%s", filepath);
} }
else else
@ -346,7 +346,7 @@ static int ventoy_plugin_theme_entry(VTOY_JSON *json, const char *isodisk)
} }
} }
grub_env_set("vtoy_theme", "random"); ventoy_env_export("vtoy_theme", "random");
value = vtoy_json_get_string_ex(json->pstChild, "random"); value = vtoy_json_get_string_ex(json->pstChild, "random");
if (value) if (value)
{ {
@ -370,39 +370,39 @@ static int ventoy_plugin_theme_entry(VTOY_JSON *json, const char *isodisk)
if (value) if (value)
{ {
debug("vtoy_gfxmode %s\n", value); debug("vtoy_gfxmode %s\n", value);
grub_env_set("vtoy_gfxmode", value); ventoy_env_export("vtoy_gfxmode", value);
} }
value = vtoy_json_get_string_ex(json->pstChild, "display_mode"); value = vtoy_json_get_string_ex(json->pstChild, "display_mode");
if (value) if (value)
{ {
debug("display_mode %s\n", value); debug("display_mode %s\n", value);
grub_env_set("vtoy_display_mode", value); ventoy_env_export("vtoy_display_mode", value);
} }
value = vtoy_json_get_string_ex(json->pstChild, "serial_param"); value = vtoy_json_get_string_ex(json->pstChild, "serial_param");
if (value) if (value)
{ {
debug("serial_param %s\n", value); debug("serial_param %s\n", value);
grub_env_set("vtoy_serial_param", value); ventoy_env_export("vtoy_serial_param", value);
} }
value = vtoy_json_get_string_ex(json->pstChild, "ventoy_left"); value = vtoy_json_get_string_ex(json->pstChild, "ventoy_left");
if (value) if (value)
{ {
grub_env_set("VTLE_LFT", value); ventoy_env_export("VTLE_LFT", value);
} }
value = vtoy_json_get_string_ex(json->pstChild, "ventoy_top"); value = vtoy_json_get_string_ex(json->pstChild, "ventoy_top");
if (value) if (value)
{ {
grub_env_set("VTLE_TOP", value); ventoy_env_export("VTLE_TOP", value);
} }
value = vtoy_json_get_string_ex(json->pstChild, "ventoy_color"); value = vtoy_json_get_string_ex(json->pstChild, "ventoy_color");
if (value) if (value)
{ {
grub_env_set("VTLE_CLR", value); ventoy_env_export("VTLE_CLR", value);
} }
node = vtoy_json_find_item(json->pstChild, JSON_TYPE_ARRAY, "fonts"); node = vtoy_json_find_item(json->pstChild, JSON_TYPE_ARRAY, "fonts");