MyFavMirrors/Ventoy
1
0
Fork 0
mirror of https://github.com/ventoy/Ventoy.git synced 2025-03-13 21:12:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

1.0.43 release

Browse Source
This commit is contained in:
longpanda 2021-05-08 18:05:04 +08:00
parent d05eab2be1
commit 47e77e003c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL/grub/grub.cfg
View File

@ -1708,7 +1708,7 @@ function img_unsupport_menuentry {
############################################################# #############################################################
############################################################# #############################################################
set VENTOY_VERSION="1.0.42" set VENTOY_VERSION="1.0.43"
#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

8
LinuxGUI/Ventoy2Disk/Core/ventoy_disk.c
View File

@ -514,6 +514,8 @@ int ventoy_get_vtoy_data(ventoy_disk *info, int *ppartstyle)
vdebug("ventoy partition layout check OK: [%llu %llu] [%llu %llu]\n", vdebug("ventoy partition layout check OK: [%llu %llu] [%llu %llu]\n",
part1_start_sector, part1_sector_count, part2_start_sector, part2_sector_count); part1_start_sector, part1_sector_count, part2_start_sector, part2_sector_count);
vtoy->ventoy_valid = 1;
vdebug("now check secure boot for %s ...\n", info->disk_path); vdebug("now check secure boot for %s ...\n", info->disk_path);
g_fatlib_media_fd = fd; g_fatlib_media_fd = fd;
@ -526,7 +528,6 @@ int ventoy_get_vtoy_data(ventoy_disk *info, int *ppartstyle)
if (ret == 0 && vtoy->ventoy_ver[0]) if (ret == 0 && vtoy->ventoy_ver[0])
{ {
vtoy->secure_boot_flag = fatlib_is_secure_boot_enable(); vtoy->secure_boot_flag = fatlib_is_secure_boot_enable();
vtoy->ventoy_valid = 1;
} }
else else
{ {
@ -542,6 +543,11 @@ int ventoy_get_vtoy_data(ventoy_disk *info, int *ppartstyle)
g_fatlib_media_fd = -1; g_fatlib_media_fd = -1;
g_fatlib_media_offset = 0; g_fatlib_media_offset = 0;
if (vtoy->ventoy_ver[0] == 0)
{
vtoy->ventoy_ver[0] = '?';
}
if (0 == vtoy->ventoy_valid) if (0 == vtoy->ventoy_valid)
{ {
goto end; goto end;