From: Ralph Ronnquist Date: Sun, 5 Nov 2023 11:22:05 +0000 (+1100) Subject: Firm up the iso boot variant. X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=f9bc75a5c3519fa4418475f86373a1934d5dac45;p=rrq%2Ftiniest.git Firm up the iso boot variant. --- diff --git a/packiso.sh b/packiso.sh index ce72a68..b6558f2 100755 --- a/packiso.sh +++ b/packiso.sh @@ -20,10 +20,17 @@ if [ ! -d $ISOTREE ] ; then echo "# Set up the isolinux boot loader in $ISOTREE" mkdir -p $ISOTREE/boot/isolinux/bios cp kernel/usr/lib/syslinux/modules/bios/* $ISOTREE/boot/isolinux/bios - mv $ISOTREE/boot/isolinux/bios/ldlinux.c32 $ISOTREE/boot/isolinux cp kernel/usr/lib/ISOLINUX/isolinux.bin $ISOTREE/boot/isolinux - cp syslinux-iso.cfg $ISOTREE/boot/isolinux/syslinux.cfg - mcopy -i $P1 ::/splash.png ::/vmlinuz $ISOTREE/ + + ## ldlinux.c32 must be sibling to isolinux.bin + mv $ISOTREE/boot/isolinux/bios/ldlinux.c32 $ISOTREE/boot/isolinux + + ## use isolinux.cfg for isolinux boot + cp syslinux-iso.cfg $ISOTREE/boot/isolinux/isolinux.cfg + + ## put splash, vmlinux and initrd as siblings + mcopy -i $P1 ::/splash.png ::/vmlinuz ::/initrd.gz $ISOTREE/boot/isolinux + fi [ -r $ISO ] && rm $ISO @@ -53,17 +60,19 @@ XORRISO=( # Mastering a disk legacy boot reusing the cdrom legacy boot -boot_image isolinux dir=/boot/isolinux - -boot_image any next - + #-boot_image any iso_mbr_part_type=0x00 + -boot_image isolinux partition_entry=gpt_basdat + # Mastering a disk UEFI boot using the separate boot partition $P1 # Bootloader = /EFI/BOOT/bootx64.efi + -boot_image any next -append_partition 2 0xef ${P1} -boot_image any efi_path=--interval:appended_partition_2:all::/EFI/BOOT/bootx64.efi - # cdrom UEFI boot is missing + # make part#2 bootable ) xorriso "${XORRISO[@]}" #sfdisk -f --part-attrs tiniest.iso 2 LegacyBIOSBootable -sfdisk -A tiniest.iso 2 +#sfdisk -A tiniest.iso 2