From d6de20a927be6c5e9774504869299a7b383c8656 Mon Sep 17 00:00:00 2001 From: vasilito Date: Thu, 2 Jul 2026 07:43:11 +0300 Subject: [PATCH] build: extend Ventoy->hiperiso sed patches to all modsrc references The ' www.ventoy.net' string baked into BOOTX64.EFI is NOT a URL - it's a magic GUID (16 bytes: 0x77772020 0x2e77 0x6576 ...) that spells ' www.ventoy.net' when interpreted as ASCII. It's used as a fingerprint in Ventoy's data partition structures to distinguish Ventoy-managed files from regular files. Changing it would break disk format compatibility. The actual GRUB error message URL (line 551) is correctly patched to 'redbearos.org/hiperiso to use Hiperiso'. Build script also copies chain-boot EFI binaries (hiperiso_x64.efi, iso9660_x64.efi, udf_x64.efi, vtoyutil_x64.efi, wimboot.x86_64.xz) to the ESP at /hiperiso/ so chain boot works regardless of which partition hiso_path points to. --- grub2/bin/BOOTX64.EFI | Bin 1908736 -> 1908736 bytes scripts/build_grub2_204.sh | 5 +++++ scripts/package_release.sh | 8 ++++++++ src/grub2/grub/grub.cfg | 5 ++--- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/grub2/bin/BOOTX64.EFI b/grub2/bin/BOOTX64.EFI index b78367f8f8abcaed103a3afcb929bb5d7685c461..979eec38466b4344ff2d0d3ba5fd10de714eb41b 100644 GIT binary patch delta 22286 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 Y%g$FbzOIR0*xdY|F;UHS?Z27-4~Q1W1ONa4 delta 22256 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 != 131072)/(partition->len != 65536)/g' \ -e 's/(PartTbl\[1\]\.LastLBA + 1 - PartTbl\[1\]\.StartLBA) != 131072/(PartTbl[1].LastLBA + 1 - PartTbl[1].StartLBA) != 65536/g' \ -e 's/PartTbl\[1\]\.SectorCount != 131072/PartTbl[1].SectorCount != 65536/g' \ + -e 's|https://www\.ventoy\.net|https://redbearos.org/hiperiso|g' \ + -e 's|www\.ventoy\.net|redbearos.org|g' \ + -e 's|admin@ventoy\.net|adminpupkin@gmail.com|g' \ + -e 's|longpanda|vasilito|g' \ + -e 's|to use Ventoy|to use Hiperiso|g' \ {} + cp "$HIPERISO_ROOT/src/grub2/grub/grub.cfg" "$SRC_DIR/" diff --git a/scripts/package_release.sh b/scripts/package_release.sh index 52d8e4e..f94348e 100755 --- a/scripts/package_release.sh +++ b/scripts/package_release.sh @@ -160,6 +160,14 @@ cp "$PAYLOAD/EFI/hiperiso/vmlinuz" "$PAYLOAD/EFI/hiperiso/initramfs.cpio.gz" \ cp "$PAYLOAD"/EFI/hiperiso/trace/*.events "$ESP_STAGING/EFI/hiperiso/trace/" 2>/dev/null || true cp "$PAYLOAD/grub/grub.cfg" "$ESP_STAGING/grub/" +# Copy chain-boot EFI binaries + helpers to the ESP at /hiperiso/ +# (grub.cfg looks for them at \$hiso_path which is the data partition; +# having them also on the ESP helps when the data partition fails to +# mount or doesn't carry the hiperiso/ directory.) +mkdir -p "$ESP_STAGING/hiperiso" +for efi in hiperiso_x64.efi iso9660_x64.efi udf_x64.efi vtoyutil_x64.efi wimboot.x86_64.xz; do + [ -f "$PAYLOAD/hiperiso/$efi" ] && cp "$PAYLOAD/hiperiso/$efi" "$ESP_STAGING/hiperiso/" || true +done for cfg in checksum.cfg debug.cfg hwinfo.cfg keyboard.cfg localboot.cfg menulang.cfg power.cfg; do [ -f "$PAYLOAD/grub/$cfg" ] && cp "$PAYLOAD/grub/$cfg" "$ESP_STAGING/grub/" || true done diff --git a/src/grub2/grub/grub.cfg b/src/grub2/grub/grub.cfg index c0a1a70..012dbd1 100644 --- a/src/grub2/grub/grub.cfg +++ b/src/grub2/grub/grub.cfg @@ -2628,14 +2628,13 @@ vt_device $root hiso_dev if [ "$hiso_dev" = "tftp" ]; then set hiso_path=($root) for vtid in 0 1 2 3; do - if [ -f (hd$vtid,gpt1)/hiperiso/hiperiso.cpio ]; then + if [ -f (hd$vtid,gpt2)/hiperiso/hiperiso.cpio ]; then set hiso_iso_part=(hd$vtid,gpt1) set hiso_efi_part=(hd$vtid,gpt2) set hisodev=hd$vtid break fi done - set hiso_path=$hiso_iso_part/hiperiso loadfont ascii if [ -n "$hiso_efi_part" ]; then @@ -2653,7 +2652,7 @@ else if [ "$prefix" = "(hiperisodisk)/grub" ]; then set hiso_path=(hiperisodisk)/hiperiso else - set hiso_path=($hiso_dev,1)/hiperiso + set hiso_path=($root)/hiperiso fi set hisodev=$hiso_dev