Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from ventoy:master #10

Merged
merged 2 commits into from
Feb 22, 2025
Merged

[pull] master from ventoy:master #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a8dc42
Fix the issue introduced in LinuxGUI version. (#3128)
ventoy Feb 22, 2025
004ad27
1.1.04 release
ventoy Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL/grub/grub.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2408,7 +2408,7 @@ function mimg_common_menuentry {
#############################################################
#############################################################

set VENTOY_VERSION="1.1.03"
set VENTOY_VERSION="1.1.04"

#ACPI not compatible with Window7/8, so disable by default
set VTOY_PARAM_NO_ACPI=1
Expand Down
10 changes: 7 additions & 3 deletions INSTALL/tool/VentoyWorker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,10 +625,14 @@ else
check_umount_disk "$DISK"
vtoycli partresize -s $DISK $part2_start
fi


vtinfo "update esp partition attribute"
vtoycli gpt -f $DISK
sync
if [ "$PART1_TYPE" = "EE" ]; then
vtinfo "update esp partition attribute"
vtoycli gpt -f $DISK
sync
fi


echo ""
vtinfo "Update Ventoy on $DISK successfully finished."
Expand Down
Binary file modified INSTALL/tool/aarch64/V2DServer
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/aarch64/Ventoy2Disk.gtk3
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/aarch64/Ventoy2Disk.qt5
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/aarch64/vtoycli
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/i386/V2DServer
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/i386/Ventoy2Disk.gtk2
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/i386/Ventoy2Disk.gtk3
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/i386/Ventoy2Disk.qt5
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/i386/vtoycli
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/mips64el/V2DServer
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/mips64el/Ventoy2Disk.gtk3
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/mips64el/Ventoy2Disk.qt5
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/mips64el/vtoycli
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/x86_64/V2DServer
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/x86_64/Ventoy2Disk.gtk2
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/x86_64/Ventoy2Disk.gtk3
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/x86_64/Ventoy2Disk.qt5
View file
Open in desktop
Binary file not shown.
Binary file modified INSTALL/tool/x86_64/vtoycli
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions LinuxGUI/Ventoy2Disk/Web/ventoy_http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,8 @@ static void * ventoy_update_thread(void *data)
pstGPT->PartTbl[1].Attr, 0x8000000000000000ULL);

pstGPT->PartTbl[1].Attr = 0x8000000000000000ULL;

pstGPT->Head.PartTblCrc = ventoy_crc32(pstGPT->PartTbl, sizeof(pstGPT->PartTbl));
pstGPT->Head.Crc = 0;
pstGPT->Head.Crc = ventoy_crc32(&(pstGPT->Head), pstGPT->Head.Length);
ventoy_write_gpt_part_table(fd, disk->size_in_byte, pstGPT);
Expand Down
37 changes: 20 additions & 17 deletions vtoycli/vtoygpt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,23 +191,26 @@ int vtoygpt_main(int argc, char **argv)
Name = pMainGptInfo->PartTbl[1].Name;
if (Name[0] == 'V' && Name[1] == 'T' && Name[2] == 'O' && Name[3] == 'Y')
{
pMainGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
pMainGptInfo->Head.PartTblCrc = VtoyCrc32(pMainGptInfo->PartTbl, sizeof(pMainGptInfo->PartTbl));
pMainGptInfo->Head.Crc = 0;
pMainGptInfo->Head.Crc = VtoyCrc32(&pMainGptInfo->Head, pMainGptInfo->Head.Length);

pBackGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
pBackGptInfo->Head.PartTblCrc = VtoyCrc32(pBackGptInfo->PartTbl, sizeof(pBackGptInfo->PartTbl));
pBackGptInfo->Head.Crc = 0;
pBackGptInfo->Head.Crc = VtoyCrc32(&pBackGptInfo->Head, pBackGptInfo->Head.Length);

lseek(fd, 512, SEEK_SET);
write(fd, (UINT8 *)pMainGptInfo + 512, sizeof(VTOY_GPT_INFO) - 512);

lseek(fd, DiskSize - 33 * 512, SEEK_SET);
write(fd, pBackGptInfo, sizeof(VTOY_BK_GPT_INFO));

fsync(fd);
if (pMainGptInfo->PartTbl[1].Attr != VENTOY_EFI_PART_ATTR)
{
pMainGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
pMainGptInfo->Head.PartTblCrc = VtoyCrc32(pMainGptInfo->PartTbl, sizeof(pMainGptInfo->PartTbl));
pMainGptInfo->Head.Crc = 0;
pMainGptInfo->Head.Crc = VtoyCrc32(&pMainGptInfo->Head, pMainGptInfo->Head.Length);

pBackGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
pBackGptInfo->Head.PartTblCrc = VtoyCrc32(pBackGptInfo->PartTbl, sizeof(pBackGptInfo->PartTbl));
pBackGptInfo->Head.Crc = 0;
pBackGptInfo->Head.Crc = VtoyCrc32(&pBackGptInfo->Head, pBackGptInfo->Head.Length);

lseek(fd, 512, SEEK_SET);
write(fd, (UINT8 *)pMainGptInfo + 512, sizeof(VTOY_GPT_INFO) - 512);

lseek(fd, DiskSize - 33 * 512, SEEK_SET);
write(fd, pBackGptInfo, sizeof(VTOY_BK_GPT_INFO));

fsync(fd);
}
}
}

Expand Down
37 changes: 20 additions & 17 deletions vtoygpt/vtoygpt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,23 +291,26 @@ int main(int argc, const char **argv)
Name = pMainGptInfo->PartTbl[1].Name;
if (Name[0] == 'V' && Name[1] == 'T' && Name[2] == 'O' && Name[3] == 'Y')
{
pMainGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
pMainGptInfo->Head.PartTblCrc = VtoyCrc32(pMainGptInfo->PartTbl, sizeof(pMainGptInfo->PartTbl));
pMainGptInfo->Head.Crc = 0;
pMainGptInfo->Head.Crc = VtoyCrc32(&pMainGptInfo->Head, pMainGptInfo->Head.Length);

pBackGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
pBackGptInfo->Head.PartTblCrc = VtoyCrc32(pBackGptInfo->PartTbl, sizeof(pBackGptInfo->PartTbl));
pBackGptInfo->Head.Crc = 0;
pBackGptInfo->Head.Crc = VtoyCrc32(&pBackGptInfo->Head, pBackGptInfo->Head.Length);

lseek(fd, 512, SEEK_SET);
write(fd, (UINT8 *)pMainGptInfo + 512, sizeof(VTOY_GPT_INFO) - 512);

lseek(fd, DiskSize - 33 * 512, SEEK_SET);
write(fd, pBackGptInfo, sizeof(VTOY_BK_GPT_INFO));

fsync(fd);
if (pMainGptInfo->PartTbl[1].Attr != VENTOY_EFI_PART_ATTR)
{
pMainGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
pMainGptInfo->Head.PartTblCrc = VtoyCrc32(pMainGptInfo->PartTbl, sizeof(pMainGptInfo->PartTbl));
pMainGptInfo->Head.Crc = 0;
pMainGptInfo->Head.Crc = VtoyCrc32(&pMainGptInfo->Head, pMainGptInfo->Head.Length);

pBackGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
pBackGptInfo->Head.PartTblCrc = VtoyCrc32(pBackGptInfo->PartTbl, sizeof(pBackGptInfo->PartTbl));
pBackGptInfo->Head.Crc = 0;
pBackGptInfo->Head.Crc = VtoyCrc32(&pBackGptInfo->Head, pBackGptInfo->Head.Length);

lseek(fd, 512, SEEK_SET);
write(fd, (UINT8 *)pMainGptInfo + 512, sizeof(VTOY_GPT_INFO) - 512);

lseek(fd, DiskSize - 33 * 512, SEEK_SET);
write(fd, pBackGptInfo, sizeof(VTOY_BK_GPT_INFO));

fsync(fd);
}
}
}

Expand Down