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
f32d342f
Commit
f32d342f
authored
Oct 29, 2021
by
longpanda
Browse files
1.0.57 release
parent
09d7ae68
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
6 deletions
+23
-6
.github/ISSUE_TEMPLATE/issue_template.yml
.github/ISSUE_TEMPLATE/issue_template.yml
+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
+19
-4
INSTALL/grub/grub.cfg
INSTALL/grub/grub.cfg
+3
-1
No files found.
.github/ISSUE_TEMPLATE/issue_template.yml
View file @
f32d342f
...
@@ -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.5
6
placeholder
:
1.0.5
7
validations
:
validations
:
required
:
true
required
:
true
-
type
:
dropdown
-
type
:
dropdown
...
...
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
View file @
f32d342f
...
@@ -2376,7 +2376,11 @@ static int ventoy_parse_plugin_config(VTOY_JSON *json, const char *isodisk)
...
@@ -2376,7 +2376,11 @@ static int ventoy_parse_plugin_config(VTOY_JSON *json, const char *isodisk)
break
;
break
;
}
}
}
}
}
for
(
cur
=
json
;
cur
;
cur
=
cur
->
pstNext
)
{
for
(
i
=
0
;
i
<
(
int
)
ARRAY_SIZE
(
g_plugin_entries
);
i
++
)
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
)
if
(
g_plugin_entries
[
i
].
flag
==
0
&&
grub_strcmp
(
g_plugin_entries
[
i
].
key
,
cur
->
pcName
)
==
0
)
...
@@ -3180,7 +3184,17 @@ grub_err_t ventoy_cmd_plugin_check_json(grub_extcmd_context_t ctxt, int argc, ch
...
@@ -3180,7 +3184,17 @@ 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
);
grub_snprintf
(
key
,
sizeof
(
key
),
"%s_%s"
,
args
[
1
],
g_arch_mode_suffix
);
for
(
node
=
json
->
pstChild
;
node
;
node
=
node
->
pstNext
)
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
;
}
}
if
(
!
node
)
{
for
(
node
=
json
->
pstChild
;
node
;
node
=
node
->
pstNext
)
{
if
(
grub_strcmp
(
node
->
pcName
,
args
[
1
])
==
0
)
{
{
break
;
break
;
}
}
...
@@ -3191,6 +3205,7 @@ grub_err_t ventoy_cmd_plugin_check_json(grub_extcmd_context_t ctxt, int argc, ch
...
@@ -3191,6 +3205,7 @@ grub_err_t ventoy_cmd_plugin_check_json(grub_extcmd_context_t ctxt, int argc, ch
grub_printf
(
"%s is NOT found in ventoy.json
\n
"
,
args
[
1
]);
grub_printf
(
"%s is NOT found in ventoy.json
\n
"
,
args
[
1
]);
goto
end
;
goto
end
;
}
}
}
for
(
i
=
0
;
i
<
(
int
)
ARRAY_SIZE
(
g_plugin_entries
);
i
++
)
for
(
i
=
0
;
i
<
(
int
)
ARRAY_SIZE
(
g_plugin_entries
);
i
++
)
{
{
...
...
INSTALL/grub/grub.cfg
View file @
f32d342f
...
@@ -355,6 +355,8 @@ function distro_specify_initrd_file_phase2 {
...
@@ -355,6 +355,8 @@ function distro_specify_initrd_file_phase2 {
vt_linux_specify_initrd_file /porteus/initrd.xz
vt_linux_specify_initrd_file /porteus/initrd.xz
elif [ -f (loop)/pyabr/boot/initrfs.img ]; then
elif [ -f (loop)/pyabr/boot/initrfs.img ]; then
vt_linux_specify_initrd_file /pyabr/boot/initrfs.img
vt_linux_specify_initrd_file /pyabr/boot/initrfs.img
elif [ -f (loop)/initrd0.img ]; then
vt_linux_specify_initrd_file /initrd0.img
fi
fi
}
}
...
@@ -2009,7 +2011,7 @@ function img_unsupport_menuentry {
...
@@ -2009,7 +2011,7 @@ function img_unsupport_menuentry {
#############################################################
#############################################################
#############################################################
#############################################################
set VENTOY_VERSION="1.0.5
6
"
set VENTOY_VERSION="1.0.5
7
"
#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
...
...
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