14 files changed, 24 insertions, 96 deletions

diff --git a/.gitignore b/.gitignore
index d4b44b5..a84ebf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@ debian-live-8.4.0-amd64-gnome-desktop.disk
 debian-live-8.4.0-amd64-gnome-desktop.iso
 boot
 var
-isolinux/live/initrd.img
-isolinux/live/vmlinuz
+isolinux/linux/initrd.img
+isolinux/linux/vmlinuz
 gnupghome
 secrets
diff --git a/initrd.sh b/initrd.sh
index 1eca9bb..0cc6bb3 100755
--- a/initrd.sh
+++ b/initrd.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-initrd=isolinux/live/initrd.img
-vmlinuz=isolinux/live/vmlinuz
+initrd=isolinux/linux/initrd.img
+vmlinuz=isolinux/linux/vmlinuz
 
 version=$(uname -r)
 conf_dir=initramfs-tools
diff --git a/isolinux/advanced.cfg b/isolinux/advanced.cfg
deleted file mode 100644
index 373451a..0000000
--- a/isolinux/advanced.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-label hdt
-        menu label ^Hardware Detection Tool (HDT)
-        com32 hdt.c32
-
-label memtest
-        menu label ^Memory Diagnostic Tool (memtest86+)
-        linux /live/memtest
diff --git a/isolinux/install.cfg b/isolinux/install.cfg
deleted file mode 100644
index 23fcdb8..0000000
--- a/isolinux/install.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-label install
-        menu label ^Install
-        linux /install/vmlinuz
-        initrd /install/initrd.gz
-        append vga=788  --- quiet
-
-label installgui
-        menu label ^Graphical install
-        linux /install/gtk/vmlinuz
-        initrd /install/gtk/initrd.gz
-        append video=vesa:ywrap,mtrr vga=788  --- quiet
diff --git a/isolinux/isolinux.cfg b/isolinux/isolinux.cfg
index ae49ae2..3cb8f33 100644
--- a/isolinux/isolinux.cfg
+++ b/isolinux/isolinux.cfg
@@ -1,5 +1,5 @@
-default live-amd64
-label live-amd64
-        linux /live/vmlinuz
-        initrd /live/initrd.img
+default samizdat
+label samizdat
+        linux linux/vmlinuz
+        initrd linux/initrd.img
         append boot=samizdat components quiet splash
diff --git a/isolinux/live.cfg b/isolinux/live.cfg
deleted file mode 100644
index 23f4b76..0000000
--- a/isolinux/live.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-label live-amd64
-        menu label ^Samizdat (amd64)
-        menu default
-        linux /live/vmlinuz
-        initrd /live/initrd.img
-        append boot=samizdat components quiet splash
-
-label live-amd64-failsafe
-        menu label ^Samizdat (amd64 failsafe)
-        linux /live/vmlinuz
-        initrd /live/initrd.img
-        append boot=samizdat components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal
diff --git a/isolinux/menu.cfg b/isolinux/menu.cfg
deleted file mode 100644
index dbc32f1..0000000
--- a/isolinux/menu.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-menu hshift 7
-menu width 60
-
-menu title Boot menu
-include stdmenu.cfg
-include live.cfg
-include install.cfg
-menu begin advanced
-        menu title ^Advanced options
-        include stdmenu.cfg
-        label mainmenu
-                menu label ^Back..
-                menu exit
-        include advanced.cfg
-menu end
-
-menu clear
diff --git a/isolinux/pxelinux.cfg/default b/isolinux/pxelinux.cfg/default
index af54e61..8e0a05f 100644
--- a/isolinux/pxelinux.cfg/default
+++ b/isolinux/pxelinux.cfg/default
@@ -1,5 +1,5 @@
-default live-amd64
-label live-amd64
-        linux /live/vmlinuz
-        initrd /live/initrd.img
+default samizdat
+label samizdat
+        linux linux/vmlinuz
+        initrd linux/initrd.img
         append boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.iso nbddev=/dev/nbd0 ip=dhcp
diff --git a/isolinux/splash.png b/isolinux/splash.png
deleted file mode 100644
index 52d9a8b..0000000
--- a/isolinux/splash.png
+++ /dev/null
diff --git a/isolinux/stdmenu.cfg b/isolinux/stdmenu.cfg
deleted file mode 100644
index 671b16f..0000000
--- a/isolinux/stdmenu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-menu background splash.png
-menu color title        * #FFFFFFFF *
-menu color border       * #00000000 #00000000 none
-menu color sel          * #ffffffff #76a1d0ff *
-menu color hotsel       1;7;37;40 #ffffffff #76a1d0ff *
-menu color tabmsg       * #ffffffff #00000000 *
-menu color help         37;40 #ffdddd00 #00000000 none
-menu vshift 12
-menu rows 10
-menu helpmsgrow 15
-# The command line must be at least one line from the bottom.
-menu cmdlinerow 16
-menu timeoutrow 16
-menu tabmsgrow 18
-menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff --git a/old-school/grok-block b/old-school/grok-block
index 006a090..75d5120 100755
--- a/old-school/grok-block
+++ b/old-school/grok-block
@@ -72,7 +72,7 @@ retry_mount()
 gpg_verify()
 {
   bootwait samizdat-cdrom
-  gpg2 --lock-never --no-permission-warning --no-auto-check-trustdb --no-options --homedir /cdrom/samizdat/gpg/gnupghome --verify "$1"
+  gpg2 --lock-never --no-permission-warning --no-auto-check-trustdb --no-options --homedir /cdrom/gnupghome --verify "$1"
 }
 is_lvm()
 {
diff --git a/old-school/lvm-create.sh b/old-school/lvm-create.sh
index b6d38d2..5a7657d 100644
--- a/old-school/lvm-create.sh
+++ b/old-school/lvm-create.sh
@@ -28,7 +28,7 @@ ceil4()
 
 losetup_layers()
 {
-    for fs in /cdrom/live/*.btrfs; do
+    for fs in /cdrom/rootfs/*.btrfs; do
         fs_rw=/"${fs##*/}".rw
         dd if=/dev/zero of="$fs_rw" bs=1M count=10
         losetup_snapshot "$fs" "$fs_rw" || return
@@ -228,7 +228,8 @@ init_gpg()
 {
   bootwait samizdat-cdrom
   export GNUPGHOME=/gpg/gnupghome
-  (umask 077; rsync --exclude '/luks-key*' --ignore-existing -rpP /cdrom/samizdat/gpg/ /gpg/)
+  mkdir -p "$GNUPGHOME"
+  (umask 077; rsync --exclude '/luks-key*' --ignore-existing -rpP /cdrom/gnupghome/ "$GNUPGHOME")
 
   if samizdat-password-agent >/var/log/samizdat-password-agent.log 2>&1; then
     clear
diff --git a/qemu.sh b/qemu.sh
index 11c10f2..e384e85 100755
--- a/qemu.sh
+++ b/qemu.sh
@@ -13,8 +13,8 @@ layered=${iso%.iso}.layered.iso
 # NET='user,tftp=isolinux,bootfile=/pxelinux.0'
 NET='tap,vlan=0,ifname=tap0,script=no,downscript=no'
 
-initrd=isolinux/live/initrd.img
-kernel=isolinux/live/vmlinuz
+initrd=isolinux/linux/initrd.img
+kernel=isolinux/linux/vmlinuz
 kcmdline='boot=samizdat components quiet splash'
 
 sudo qemu-system-x86_64 -enable-kvm -smp 2 -m 640 -k en-us \
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 \