Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dadigang
Ventoy
Commits
fd7e34b6
Commit
fd7e34b6
authored
Dec 04, 2022
by
longpanda
Browse files
1.0.84 release
parent
e85c0275
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
10 deletions
+23
-10
.github/ISSUE_TEMPLATE/issue_template.yml
.github/ISSUE_TEMPLATE/issue_template.yml
+1
-1
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
+11
-1
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
+1
-1
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
+7
-4
INSTALL/grub/grub.cfg
INSTALL/grub/grub.cfg
+3
-3
No files found.
.github/ISSUE_TEMPLATE/issue_template.yml
View file @
fd7e34b6
...
@@ -21,7 +21,7 @@ body:
...
@@ -21,7 +21,7 @@ body:
attributes
:
attributes
:
label
:
Ventoy Version
label
:
Ventoy Version
description
:
What version of ventoy are you running?
description
:
What version of ventoy are you running?
placeholder
:
1.0.8
3
placeholder
:
1.0.8
4
validations
:
validations
:
required
:
true
required
:
true
-
type
:
dropdown
-
type
:
dropdown
...
...
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
View file @
fd7e34b6
...
@@ -6177,12 +6177,21 @@ static grub_err_t ventoy_cmd_fs_ignore_case(grub_extcmd_context_t ctxt, int argc
...
@@ -6177,12 +6177,21 @@ static grub_err_t ventoy_cmd_fs_ignore_case(grub_extcmd_context_t ctxt, int argc
return
0
;
return
0
;
}
}
static
grub_err_t
ventoy_cmd_init_menu_lang
(
grub_extcmd_context_t
ctxt
,
int
argc
,
char
**
args
)
{
(
void
)
ctxt
;
(
void
)
argc
;
ventoy_plugin_load_menu_lang
(
1
,
args
[
0
]);
VENTOY_CMD_RETURN
(
0
);
}
static
grub_err_t
ventoy_cmd_load_menu_lang
(
grub_extcmd_context_t
ctxt
,
int
argc
,
char
**
args
)
static
grub_err_t
ventoy_cmd_load_menu_lang
(
grub_extcmd_context_t
ctxt
,
int
argc
,
char
**
args
)
{
{
(
void
)
ctxt
;
(
void
)
ctxt
;
(
void
)
argc
;
(
void
)
argc
;
ventoy_plugin_load_menu_lang
(
args
[
0
]);
ventoy_plugin_load_menu_lang
(
0
,
args
[
0
]);
VENTOY_CMD_RETURN
(
0
);
VENTOY_CMD_RETURN
(
0
);
}
}
...
@@ -6399,6 +6408,7 @@ static cmd_para ventoy_cmds[] =
...
@@ -6399,6 +6408,7 @@ static cmd_para ventoy_cmds[] =
{
"vt_limine_menu"
,
ventoy_cmd_linux_limine_menu
,
0
,
NULL
,
""
,
""
,
NULL
},
{
"vt_limine_menu"
,
ventoy_cmd_linux_limine_menu
,
0
,
NULL
,
""
,
""
,
NULL
},
{
"vt_secondary_recover_mode"
,
ventoy_cmd_secondary_recover_mode
,
0
,
NULL
,
""
,
""
,
NULL
},
{
"vt_secondary_recover_mode"
,
ventoy_cmd_secondary_recover_mode
,
0
,
NULL
,
""
,
""
,
NULL
},
{
"vt_load_menu_lang"
,
ventoy_cmd_load_menu_lang
,
0
,
NULL
,
""
,
""
,
NULL
},
{
"vt_load_menu_lang"
,
ventoy_cmd_load_menu_lang
,
0
,
NULL
,
""
,
""
,
NULL
},
{
"vt_init_menu_lang"
,
ventoy_cmd_init_menu_lang
,
0
,
NULL
,
""
,
""
,
NULL
},
{
"vt_cur_menu_lang"
,
ventoy_cmd_cur_menu_lang
,
0
,
NULL
,
""
,
""
,
NULL
},
{
"vt_cur_menu_lang"
,
ventoy_cmd_cur_menu_lang
,
0
,
NULL
,
""
,
""
,
NULL
},
};
};
...
...
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
View file @
fd7e34b6
...
@@ -1261,7 +1261,7 @@ grub_err_t ventoy_cmd_browser_disk(grub_extcmd_context_t ctxt, int argc, char **
...
@@ -1261,7 +1261,7 @@ grub_err_t ventoy_cmd_browser_disk(grub_extcmd_context_t ctxt, int argc, char **
int
ventoy_get_fs_type
(
const
char
*
fs
);
int
ventoy_get_fs_type
(
const
char
*
fs
);
int
ventoy_img_name_valid
(
const
char
*
filename
,
grub_size_t
namelen
);
int
ventoy_img_name_valid
(
const
char
*
filename
,
grub_size_t
namelen
);
void
*
ventoy_alloc_chain
(
grub_size_t
size
);
void
*
ventoy_alloc_chain
(
grub_size_t
size
);
int
ventoy_plugin_load_menu_lang
(
const
char
*
lang
);
int
ventoy_plugin_load_menu_lang
(
int
init
,
const
char
*
lang
);
const
char
*
ventoy_get_vmenu_title
(
const
char
*
vMenu
);
const
char
*
ventoy_get_vmenu_title
(
const
char
*
vMenu
);
grub_err_t
ventoy_cmd_cur_menu_lang
(
grub_extcmd_context_t
ctxt
,
int
argc
,
char
**
args
);
grub_err_t
ventoy_cmd_cur_menu_lang
(
grub_extcmd_context_t
ctxt
,
int
argc
,
char
**
args
);
extern
int
ventoy_menu_push_key
(
int
code
);
extern
int
ventoy_menu_push_key
(
int
code
);
...
...
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
View file @
fd7e34b6
...
@@ -3474,7 +3474,7 @@ const char *ventoy_get_vmenu_title(const char *vMenu)
...
@@ -3474,7 +3474,7 @@ const char *ventoy_get_vmenu_title(const char *vMenu)
return
vtoy_json_get_string_ex
(
g_menu_lang_json
->
pstChild
,
vMenu
);
return
vtoy_json_get_string_ex
(
g_menu_lang_json
->
pstChild
,
vMenu
);
}
}
int
ventoy_plugin_load_menu_lang
(
const
char
*
lang
)
int
ventoy_plugin_load_menu_lang
(
int
init
,
const
char
*
lang
)
{
{
int
ret
=
1
;
int
ret
=
1
;
grub_file_t
file
=
NULL
;
grub_file_t
file
=
NULL
;
...
@@ -3528,9 +3528,12 @@ int ventoy_plugin_load_menu_lang(const char *lang)
...
@@ -3528,9 +3528,12 @@ int ventoy_plugin_load_menu_lang(const char *lang)
grub_snprintf
(
g_ventoy_hotkey_tip
,
sizeof
(
g_ventoy_hotkey_tip
),
"%s"
,
ventoy_get_vmenu_title
(
"VTMENU_STR_HOTKEY_LIST"
));
grub_snprintf
(
g_ventoy_hotkey_tip
,
sizeof
(
g_ventoy_hotkey_tip
),
"%s"
,
ventoy_get_vmenu_title
(
"VTMENU_STR_HOTKEY_LIST"
));
}
}
ventoy_menu_push_key
(
GRUB_TERM_ESC
);
if
(
init
==
0
)
ventoy_menu_push_key
(
GRUB_TERM_ESC
);
{
g_ventoy_menu_refresh
=
1
;
ventoy_menu_push_key
(
GRUB_TERM_ESC
);
ventoy_menu_push_key
(
GRUB_TERM_ESC
);
g_ventoy_menu_refresh
=
1
;
}
ret
=
0
;
ret
=
0
;
end:
end:
...
...
INSTALL/grub/grub.cfg
View file @
fd7e34b6
...
@@ -2354,7 +2354,7 @@ function img_unsupport_menuentry {
...
@@ -2354,7 +2354,7 @@ function img_unsupport_menuentry {
#############################################################
#############################################################
#############################################################
#############################################################
set VENTOY_VERSION="1.0.8
3
"
set VENTOY_VERSION="1.0.8
4
"
#ACPI not compatible with Window7/8, so disable by default
#ACPI not compatible with Window7/8, so disable by default
set VTOY_PARAM_NO_ACPI=1
set VTOY_PARAM_NO_ACPI=1
...
@@ -2457,9 +2457,9 @@ else
...
@@ -2457,9 +2457,9 @@ else
fi
fi
if [ -n "$VTOY_MENU_LANGUAGE" ]; then
if [ -n "$VTOY_MENU_LANGUAGE" ]; then
vt_
load
_menu_lang "$VTOY_MENU_LANGUAGE"
vt_
init
_menu_lang "$VTOY_MENU_LANGUAGE"
else
else
vt_
load
_menu_lang en_US
vt_
init
_menu_lang en_US
fi
fi
if [ -n "$VTOY_MENU_TIMEOUT" ]; then
if [ -n "$VTOY_MENU_TIMEOUT" ]; then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment