From 06b416ea023049bd566c571222caed68cf9ca742 Mon Sep 17 00:00:00 2001 From: vasilito Date: Wed, 1 Jul 2026 16:15:26 +0300 Subject: [PATCH] fix: revert partition 2 to msftdata type (matches Ventoy) Byte-by-byte comparison of Ventoy vs hiperiso USB showed the only significant difference: Ventoy uses Microsoft basic data type GUID (EBD0A0A2-...) with attribute 0x8000000000000000, while our ESP-type attempt used (C12A7328-...). The user's UEFI firmware only recognizes the msftdata+hidden attribute combination as bootable. Reverted all 3 source paths back to msftdata: - hiperiso_util.c: Table[1].PartType = WindowsDataPartType - hiperiso_lib.sh: set 2 msftdata on (parted flag) - partresize.c: g_WindowsDataPartGuid for partition resize update --- .../grub/themes/hiperiso/background.png.bak | Bin 0 -> 18551 bytes src/gui/Core/hiperiso_util.c | 4 +--- src/hisocli/partresize.c | 4 ++-- src/installer/tool/hiperiso_lib.sh | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 src/grub2/grub/themes/hiperiso/background.png.bak diff --git a/src/grub2/grub/themes/hiperiso/background.png.bak b/src/grub2/grub/themes/hiperiso/background.png.bak new file mode 100644 index 0000000000000000000000000000000000000000..262db43b3dac24cbe581c547074b5d5d7d4e92f8 GIT binary patch literal 18551 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 literal 0 HcmV?d00001 diff --git a/src/gui/Core/hiperiso_util.c b/src/gui/Core/hiperiso_util.c index 6f75ab3..b404ca2 100644 --- a/src/gui/Core/hiperiso_util.c +++ b/src/gui/Core/hiperiso_util.c @@ -383,7 +383,6 @@ int hiperiso_fill_gpt(uint64_t size, uint64_t reserve, int align4k, HISO_GPT_INF HISO_GPT_HDR *Head = &gpt->Head; HISO_GPT_PART_TBL *Table = gpt->PartTbl; hiperiso_guid WindowsDataPartType = { 0xebd0a0a2, 0xb9e5, 0x4433, { 0x87, 0xc0, 0x68, 0xb6, 0xb7, 0x26, 0x99, 0xc7 } }; - hiperiso_guid EfiSystemPartType = { 0xc12a7328, 0xf81f, 0x11d2, { 0xba, 0x4b, 0x00, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b } }; HiperisoFillProtectMBR(size, &gpt->MBR); @@ -435,8 +434,7 @@ int hiperiso_fill_gpt(uint64_t size, uint64_t reserve, int align4k, HISO_GPT_INF Table[0].Attr = 0; hiperiso_fill_gpt_partname(Table[0].Name, "Hiperiso"); - // Use ESP type for partition 2 (required for UEFI firmware to find BOOTX64.EFI) - memcpy(&(Table[1].PartType), &EfiSystemPartType, sizeof(hiperiso_guid)); + memcpy(&(Table[1].PartType), &WindowsDataPartType, sizeof(hiperiso_guid)); hiperiso_gen_preudo_uuid(&(Table[1].PartGuid)); Table[1].StartLBA = Table[0].LastLBA + 1; Table[1].LastLBA = Table[1].StartLBA + HISOEFI_PART_BYTES / 512 - 1; diff --git a/src/hisocli/partresize.c b/src/hisocli/partresize.c index 69395fe..ce55d94 100644 --- a/src/hisocli/partresize.c +++ b/src/hisocli/partresize.c @@ -36,7 +36,7 @@ static int g_disk_fd = 0; static UINT64 g_disk_offset = 0; static GUID g_ZeroGuid = {0}; -static GUID g_EfiSystemPartGuid = { 0xc12a7328, 0xf81f, 0x11d2, { 0xba, 0x4b, 0x00, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b } }; +static GUID g_WindowsDataPartGuid = { 0xebd0a0a2, 0xb9e5, 0x4433, { 0x87, 0xc0, 0x68, 0xb6, 0xb7, 0x26, 0x99, 0xc7 } }; static int hiso_disk_read(uint32 sector, uint8 *buffer, uint32 sector_count) { @@ -591,7 +591,7 @@ static int update_part_table(char *disk, UINT64 part2start) } memset(PartTbl + 1, 0, sizeof(HISO_GPT_PART_TBL)); - memcpy(&(PartTbl[1].PartType), &g_EfiSystemPartGuid, sizeof(GUID)); + memcpy(&(PartTbl[1].PartType), &g_WindowsDataPartGuid, sizeof(GUID)); hiperiso_gen_preudo_uuid(&(PartTbl[1].PartGuid)); PartTbl[0].LastLBA = part2start - 1; diff --git a/src/installer/tool/hiperiso_lib.sh b/src/installer/tool/hiperiso_lib.sh index f9665c4..59cf8f1 100644 --- a/src/installer/tool/hiperiso_lib.sh +++ b/src/installer/tool/hiperiso_lib.sh @@ -444,7 +444,7 @@ format_hiperiso_disk_gpt() { hisodebug "format disk by parted ..." if [ "$TOOLDIR" != "aarch64" ]; then - vt_set_efi_type="set 2 esp on" + vt_set_efi_type="set 2 msftdata on" fi parted -a none --script $DISK \