2 files changed, 14 insertions, 51 deletions

diff --git a/xorriso.sh b/xorriso.sh
index dbe5fe8..5068d4b 100755
--- a/xorriso.sh
+++ b/xorriso.sh
@@ -36,23 +36,11 @@ make_gnupghome()
 
 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
+if [ grub-efi.sh -nt grub-efi ]; then
+    ./grub-efi.sh || die "Error: grub-efi.sh failed"
+fi
 
-# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/isolinux/
-# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/isolinux/efiboot.img
+set -ex
 
 xorriso \
         -drive_class clear_list all \
@@ -63,19 +51,16 @@ xorriso \
         -pathspecs on \
         \
         \
-        -add isolinux -- \
-        -follow link -add "$@" -- -follow default \
         -add "${gpg_iso_path}=${gnupghome}" -- \
+        -add linux=isolinux/linux -- \
+        -follow link -add "$@" -- -follow default \
         \
         \
-        -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 \
+        -as mkisofs -graft-points \
+        -b grub/i386-pc/eltorito.img  \
+        -no-emul-boot -boot-info-table \
+        --embedded-boot grub-efi/embedded.img \
+        --protective-msdos-label \
+        grub=grub-efi/grub
 
 mv -f "$outdev"~ "$outdev"
diff --git a/xorriso.test-efi.sh b/xorriso.test-efi.sh
index a32f4d1..3591528 100755
--- a/xorriso.test-efi.sh
+++ b/xorriso.test-efi.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-outdev=test-efi.iso
+outdev=samizdat.iso
 indev=debian-live-8.4.0-amd64-standard.iso
 volid=SamizdatLive
 gpg_iso_path=gnupghome
@@ -37,27 +37,11 @@ make_gnupghome()
 make_gnupghome
 
 if [ grub-efi.sh -nt grub-efi ]; then
-    ./grub-efi.sh
+    ./grub-efi.sh || die "Error: grub-efi.sh failed"
 fi
 
 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
-
 xorriso \
         -drive_class clear_list all \
         -outdev "$outdev"~ \
@@ -78,10 +62,4 @@ xorriso \
         --protective-msdos-label \
         grub=grub-efi/grub
 
-# -add isolinux -- \
-# -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \
-#       -isohybrid-gpt-basdat
-
-# -add boot/eltorito.img=/home/d/src/grb/rescue/iso/boot/grub/i386-pc/eltorito.img -- \
-
 mv -f "$outdev"~ "$outdev"