:: commit 13ae2fb9648fe6e00272269d4ba3ff4fac0c97e1

mintsuki <mintsuki@protonmail.com> — 2024-10-22 22:05

parents: 4826b9d9bf

misc: xorriso: Create Joliet info and hfsplus for ISOHYBRIDs. Fixes #372

diff --git a/USAGE.md b/USAGE.md
index 132a4edd..b82626d4 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -65,9 +65,9 @@ relevant Limine EFI executables over (such as `BOOTX64.EFI`).
 Place any other file you want to be on the final ISO in said directory, then
 run:
 ```
-xorriso -as mkisofs -b <relative path of limine-bios-cd.bin> \
-        -no-emul-boot -boot-load-size 4 -boot-info-table \
-        --efi-boot <relative path of limine-uefi-cd.bin> \
+xorriso -as mkisofs -R -r -J -b <relative path of limine-bios-cd.bin> \
+        -no-emul-boot -boot-load-size 4 -boot-info-table -hfsplus \
+        -apm-block-size 2048 --efi-boot <relative path of limine-uefi-cd.bin> \
         -efi-boot-part --efi-boot-image --protective-msdos-label \
         <root directory> -o image.iso
 ```
diff --git a/test.mk b/test.mk
index 66b14405..2af847f7 100644
--- a/test.mk
+++ b/test.mk
@@ -187,7 +187,7 @@ full-hybrid-test:
 	cp -rv test/* test_image/boot/
 	$(MKDIR_P) test_image/EFI/BOOT
 	cp -v $(BINDIR)/BOOT*.EFI test_image/EFI/BOOT/
-	xorriso -as mkisofs -b boot/limine-bios-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table --efi-boot boot/limine-uefi-cd.bin -efi-boot-part --efi-boot-image --protective-msdos-label test_image/ -o test.iso
+	xorriso -as mkisofs -R -r -J -b boot/limine-bios-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table -hfsplus -apm-block-size 2048 --efi-boot boot/limine-uefi-cd.bin -efi-boot-part --efi-boot-image --protective-msdos-label test_image/ -o test.iso
 	$(BINDIR)/limine bios-install test.iso
 	qemu-system-x86_64 -m 512M -M q35 -drive if=pflash,unit=0,format=raw,file=ovmf-x64/OVMF_CODE.fd,readonly=on -net none -smp 4   -cdrom test.iso -debugcon stdio
 	qemu-system-x86_64 -m 512M -M q35 -drive if=pflash,unit=0,format=raw,file=ovmf-x64/OVMF_CODE.fd,readonly=on -net none -smp 4   -hda test.iso -debugcon stdio
tab: 248 wrap: offon