get rid of unused isolinux files; change iso cdrom paths

2 files changed, 4 insertions, 3 deletions

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