1 files changed, 6 insertions, 17 deletions

diff --git a/xorriso.sh b/xorriso.sh
index b5f7e46..944682e 100755
--- a/xorriso.sh
+++ b/xorriso.sh
@@ -3,10 +3,8 @@
 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
-btrfs_iso_path=live/filesystem.btrfs
 btrfs_filesystem=debian-live-8.4.0-amd64-standard.btrfs
-gpg_iso_path=samizdat/gpg/gnupghome
+gpg_iso_path=gnupghome
 gnupghome=gnupghome
 secrets=secrets
 
@@ -47,19 +45,6 @@ set -ex
 # 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"~ \
@@ -68,7 +53,11 @@ xorriso \
         -volid "$volid" \
         -pathspecs on \
         \
-        -add live=isolinux/live/ isolinux -- \
+        \
+        -add isolinux -- \
+        -add "rootfs/${btrfs_filesystem}=${btrfs_filesystem}" -- \
+        -add "${gpg_iso_path}=${gnupghome}" -- \
+        \
         \
         -as mkisofs \
         -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \