X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=packiso.sh;h=f3e7ee95e3fe2055a8f533ece736d4bcc838d0dc;hb=HEAD;hp=0f1ed4535e4db5d1e2cc267a35e232776255d39b;hpb=22c4d3b601c68d1f6aaa6e256d3c520720f83843;p=rrq%2Ftiniest.git

diff --git a/packiso.sh b/packiso.sh
index 0f1ed45..f3e7ee9 100755
--- a/packiso.sh
+++ b/packiso.sh
@@ -1,40 +1,46 @@
 #!/bin/bash
 #
-# Run xorriso to make a bootable ISO of bootimage.raw; a hybrid, nulti
+# Run xorriso to make a bootable ISO of bootimage.raw; a hybrid, multi
 # mode bootable ISO.
 
 set -e
 
 ISOTREE=isotree
 ISO=tiniest.iso
-P1=$ISOTREE/part1.raw
-
-echo "# Prepare ISO content tree"
+P1=part1.raw # $ISOTREE/part1.raw
 
+echo "# Prepare ISO content tree unless it's already set up"
 if [ ! -d $ISOTREE ] ; then
     mkdir $ISOTREE
-    touch $ISOTREE/catalog # Boot catalog
+
+    [ -d extra ] && rsync -a extra/. $ISOTREE/.
+
     # Determine start and size of first parition
     X=( $(sfdisk -l -ostart,sectors bootimage.raw | tail -n 2) )
     dd if=bootimage.raw of=$P1 skip=${X[0]} count=${X[1]}
-    echo "# Set up the isolinux boot loader"
-    mkdir -p $ISOTREE/boot/syslinux/bios
-    cp kernel/usr/lib/syslinux/modules/bios/* $ISOTREE/boot/syslinux/bios
-    mv $ISOTREE/boot/syslinux/bios/ldlinux.c32 $ISOTREE/
-    cp kernel/usr/lib/ISOLINUX/isolinux.bin $ISOTREE/
-    mcopy -i $P1 ::/syslinux.cfg $ISOTREE/
-    mcopy -i $P1 ::/bootmenu.cfg $ISOTREE/
-    mcopy -i $P1 ::/splash.png $ISOTREE/
-    mcopy -i $P1 ::/vmlinuz $ISOTREE/
-    mcopy -i $P1 ::/initrd.gz $ISOTREE/
+
+    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
+    cp kernel/usr/lib/ISOLINUX/isolinux.bin $ISOTREE/boot/isolinux
+
+    ## 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
+[ -r $ISO ] && rm $ISO
+
 PREPID="'$(id -un), $(getent passwd $(id -un)|awk -F: '{print $5}')'"
 
 XORRISO=(
     -report_about ALL
-    --outdev $ISO
+    -outdev $ISO
     -map $ISOTREE /
     -rockridge on -joliet on
     -volid "TINIEST"
@@ -50,15 +56,24 @@ XORRISO=(
     #-out_charset "UTF8" ??
     -uid 0 -gid 0
 
-    -append_partition 2 0xef ${P1}
-    -boot_image next cat_path=/catalog
-    -boot_image any system_area=kernel/usr/lib/ISOLINUX/isohdppx.bin
-    -boot_image any bin_path=/isolinux.bin
-    -boot_image any boot_info_table=on
+    # Mastering a cdrom legacy boot that uses the ISO tree only
+    -boot_image isolinux system_area=kernel/usr/lib/ISOLINUX/isohdpfx.bin
+
+    # Mastering a disk legacy boot reusing the cdrom legacy boot
+    -boot_image isolinux dir=/boot/isolinux
+    #-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
-    -boot_image any
+    -append_partition 2 0xef ${P1}
+    -boot_image any 
     efi_path=--interval:appended_partition_2:all::/EFI/BOOT/bootx64.efi
-    -boot_image any next
+
+    # make part#2 bootable
 )
 
 xorriso "${XORRISO[@]}"
+#sfdisk -f --part-attrs tiniest.iso 2 LegacyBIOSBootable
+#sfdisk -A tiniest.iso 2