Skip to content

A better fix for ventoy/vtoyboot#48 #3397

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+36 −9
Open

A better fix for ventoy/vtoyboot#48 #3397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,6 +875,13 @@ typedef struct VDIPREHEADER
grub_uint32_t u32Signature;
/** The image version (VDI_IMAGE_VERSION). */
grub_uint32_t u32Version;
grub_uint32_t u32HeaderSize, u32ImageType, u32ImageFlags;
char szDescription[256];
grub_uint32_t u32BlockmapOffset, u32DataOffset;
grub_uint32_t u32Cylinders, u32Heads, u32Sectors;
grub_uint32_t u32SectorSize, u32Unused1;
grub_uint64_t u64DiskSize;
grub_uint32_t u32BlockSize, u32BlockExtra, u32BlocksInImage, u32BlocksAllocated;
} VDIPREHEADER, *PVDIPREHEADER;

#pragma pack()
Expand Down
38 changes: 29 additions & 9 deletions GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_vhd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,21 +539,41 @@ grub_err_t ventoy_cmd_get_vtoy_type(grub_extcmd_context_t ctxt, int argc, char *
if (vdihdr.u32Signature == VDI_IMAGE_SIGNATURE)
{
grub_snprintf(type, sizeof(type), "vdi");
if (grub_strncmp(vdihdr.szFileInfo, VDI_IMAGE_FILE_INFO, grub_strlen(VDI_IMAGE_FILE_INFO)) == 0)
if (vdihdr.u32ImageType != 2)
{
offset = 2 * 1048576;
g_img_trim_head_secnum = offset / 512;
debug("VDI V1\n");
debug("VDI image must be static, but it is type <%d>\n", vdihdr.u32ImageType);
}
else if (grub_strncmp(vdihdr.szFileInfo, VDI_IMAGE_FILE_INFO2, grub_strlen(VDI_IMAGE_FILE_INFO2)) == 0)
else if (vdihdr.u32Version != 0x10001)
{
offset = 2 * 1048576;
g_img_trim_head_secnum = offset / 512;
debug("VDI V2\n");
debug("VDI image must be version 1.1, but it is version <%d.%d>\n",
vdihdr.u32Version >> 16, vdihdr.u32Version & 0xffff);
}
else if (vdihdr.u32SectorSize != 512)
{
debug("VDI image sector size must be 512, but it is <%d>\n", vdihdr.u32SectorSize);
}
else if (vdihdr.u32BlockmapOffset & 0x1ff)
{
debug("VDI image blockmap offset <%d> is not on a sector boundary\n", vdihdr.u32BlockmapOffset);
}
else if (vdihdr.u32DataOffset & 0x1ff)
{
debug("VDI image data offset <%d> is not on a sector boundary\n", vdihdr.u32DataOffset);
}
else if (vdihdr.u32BlockSize != 1048576)
{
debug("VDI image cluster size must be 1048576, but it is <%d>\n", vdihdr.u32BlockSize);
}
else if (vdihdr.u64DiskSize > (grub_uint64_t)vdihdr.u32BlocksInImage << 20)
{
debug("VDI image bitmap has room for only <%lld> bytes, but image is <%lld> bytes\n",
(grub_uint64_t)vdihdr.u32BlocksInImage << 20, vdihdr.u64DiskSize);
}
else
{
debug("invalid file info <%s>\n", vdihdr.szFileInfo);
offset = vdihdr.u32DataOffset;
g_img_trim_head_secnum = offset / 512;
debug("%s\n", vdihdr.szFileInfo);
}
}
else
Expand Down