1 files changed, 44 insertions, 6 deletions

diff --git a/xorriso.sh b/xorriso.sh
index 784f2ef..83c308e 100755
--- a/xorriso.sh
+++ b/xorriso.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-outdev=debian-live-8.4.0-amd64-standard.btrfs.iso
+outdev=debian-live-8.4.0-amd64-standard.btrfs.isohybrid2
 indev=debian-live-8.4.0-amd64-standard.iso
 volid=SamizdatLive
 squashfs_iso_path=live/filesystem.squashfs
@@ -31,15 +31,53 @@ make_gnupghome
 
 set -ex
 
+# http://www.syslinux.org/wiki/index.php?title=Isohybrid
+# xorriso -as mkisofs \
+#   -o output.iso \
+#   -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin \
+#   -c isolinux/boot.cat \
+#   -b isolinux/isolinux.bin \
+#      -no-emul-boot -boot-load-size 4 -boot-info-table \
+#   -eltorito-alt-boot \
+#   -e isolinux/efiboot.img \
+#      -no-emul-boot \
+#      -isohybrid-gpt-basdat \
+#   CD_root
+
+# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/isolinux/
+# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/isolinux/efiboot.img
+
+# -boot_image isolinux dir=isolinux \
+# -boot_image isolinux next -boot_image isolinux system_area=/usr/lib/ISOLINUX/isohdpfx.bin \
+
+# -add "${btrfs_iso_path}=${btrfs_filesystem}" -- \
+# -add "${gpg_iso_path}=${gnupghome}" -- \
+
+
+
+
+# -rm "$squashfs_iso_path" -- \
+# -rm_r isolinux live -- \
+# -add isolinux=isolinux -- \
+
 xorriso \
         -drive_class clear_list all \
         -outdev "$outdev"~ -indev "$indev" \
         -report_about mishap \
-        -volid "$volid" \
         -return_with sorry 0 \
+        -volid "$volid" \
         -pathspecs on -overwrite on \
-        -rm "$squashfs_iso_path" -- \
-        -add_plainly any \
-        "${btrfs_iso_path}=${btrfs_filesystem}" \
-        "${gpg_iso_path}=${gnupghome}"
+        \
+        -rm_r live install pool -- -pathspecs on -add live=isolinux/live/ isolinux/pxelinux.* isolinux/*.cfg isolinux/efiboot.img -- \
+        \
+        -as mkisofs \
+        -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \
+        -c isolinux/boot.cat \
+        -b isolinux/isolinux.bin \
+        -no-emul-boot -boot-load-size 4 -boot-info-table \
+        -eltorito-alt-boot \
+        -e isolinux/efiboot.img \
+        -no-emul-boot \
+        -isohybrid-gpt-basdat \
+
 mv -f "$outdev"~ "$outdev"