more path fixes

8 files changed, 28 insertions, 4 deletions

diff --git a/src/grub-efi.sh b/src/grub-efi.sh
index e2d50f6..e722990 100755
--- a/src/grub-efi.sh
+++ b/src/grub-efi.sh
@@ -32,6 +32,7 @@ EOF
 }
 
 real_destdir=$samizdat_grub_efi_dir
+[ "$real_destdir" ] || exit 1
 destdir=$real_destdir.tmp
 
 set -e
diff --git a/src/initrd.sh b/src/initrd.sh
index 8cc8ea1..458d0f5 100755
--- a/src/initrd.sh
+++ b/src/initrd.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. samizdat-paths.sh
+
 initrd=${samizdat_isolinux_dir}/linux/initrd.img
 vmlinuz=${samizdat_isolinux_dir}/linux/vmlinuz
 
diff --git a/src/initrd/initrd-dependencies.txt b/src/initrd/initrd-dependencies.txt
new file mode 100644
index 0000000..cf73861
--- /dev/null
+++ b/src/initrd/initrd-dependencies.txt
@@ -0,0 +1,14 @@
+expect
+pgpdump
+monkeysphere
+libmime-base32-perl
+pinentry-curses
+mdadm
+ntfs-3g
+hfsplus
+isolinux
+nbd-client
+cryptsetup
+hfsprogs
+grub-pc
+initramfs-tools
diff --git a/src/patchroot.sh b/src/initrd/patchroot.sh
index 738beac..738beac 100755
--- a/src/patchroot.sh
+++ b/src/initrd/patchroot.sh
diff --git a/src/initrd/vol_id.txt b/src/initrd/vol_id.txt
new file mode 100644
index 0000000..6633321
--- /dev/null
+++ b/src/initrd/vol_id.txt
@@ -0,0 +1 @@
+SamizdatLive
diff --git a/src/qemu.sh b/src/qemu.sh
index dfed521..3b355b4 100755
--- a/src/qemu.sh
+++ b/src/qemu.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. samizdat-path.sh
+. samizdat-paths.sh
 
 # iso=debian-live-8.4.0-amd64-gnome-desktop.iso
 # iso=debian-live-8.4.0-amd64-standard.iso
diff --git a/src/samizdat-paths.sh b/src/samizdat-paths.sh
index c437c5b..5980ba6 100644
--- a/src/samizdat-paths.sh
+++ b/src/samizdat-paths.sh
@@ -1,5 +1,7 @@
 samizdat_initrd_files_dir=/home/d/sami/src/initrd
 samizdat_execs_dir=/home/d/src/samizdat
-samizdat_child_dir=./child
+samizdat_child_dir=/home/d/sami/child
 samizdat_isolinux_dir=/home/d/sami/isolinux
-PATH=${libexecdir}/${PACKAGE}/bin:${PATH}
+samizdat_grub_efi_dir=/home/d/sami/grub-efi
+samizdat_iso_dir=/home/d/sami
+PATH=/usr/local/samizdat/bin:${PATH}
diff --git a/src/xorriso-usb.sh b/src/xorriso-usb.sh
index 61fcda0..7ff9825 100644
--- a/src/xorriso-usb.sh
+++ b/src/xorriso-usb.sh
@@ -35,6 +35,10 @@ fi
 
 for fs; do
     [ -f "$fs" ] || die "not a file: $fs"
+    case "$fs" in
+        *.btrfs) ;;
+        *) die "invalid name (does not match *.btrfs): $fs" ;;
+    esac
     shift
     set -- "$@" "rootfs/${fs##*/}=$fs"
 done
@@ -137,7 +141,7 @@ if [ "$QUICK_TEST" ]; then
 fi
 
 if [ "$REPLACE_INITRD" ]; then
-    initrd.sh
+    initrd.sh || die 'initrd.sh failed'
 fi
 
 (set -x