more path fixes

11 files changed, 35 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index 767f5f3..b2fa127 100644
--- a/Makefile
+++ b/Makefile
@@ -2,22 +2,25 @@ PACKAGE=samizdat-rhizome
 prefix=/usr/local
 exec_prefix=${prefix}
 bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-datarootdir=${prefix}/share
-datadir=${datarootdir}
-mandir=${datarootdir}/man
-infodir=${datarootdir}/info
-docdir=${datarootdir}/doc/${PACKAGE}
-sysconfdir=$(prefix)/etc
-libexecdir=$(exec_prefix)/libexec
+# libdir=${exec_prefix}/lib
+# includedir=${prefix}/include
+# datarootdir=${prefix}/share
+# datadir=${datarootdir}
+# mandir=${datarootdir}/man
+# infodir=${datarootdir}/info
+# docdir=${datarootdir}/doc/${PACKAGE}
+# sysconfdir=$(prefix)/etc
+# libexecdir=$(exec_prefix)/libexec
 
+all:
+        @echo unimplemented
 
-bin_programs=xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh btrfs-send-root.sh var.sh
+bin_programs=$(addprefix src/, xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh samizdat-paths.sh)
 data_files=
-libexec_programs=grub-efi.sh keygen.sh initrd.sh
+libexec_programs=
 
 install:
         install ${bin_programs} ${bindir}
-        install ${libexec_programs} ${libexecdir}
-        install ${data_files} ${datadir}/${PACKAGE}
+
+# install ${libexec_programs} ${libexecdir}
+# install ${data_files} ${datadir}/${PACKAGE}
diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index eb4497f..db2fd1c 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -5,8 +5,11 @@
 CopyExec() { copy_exec "$@" || exit 1; }
 
 . /usr/share/initramfs-tools/hook-functions
+PATH=/usr/local/bin:$PATH
 . samizdat-paths.sh
 
+set -x
+
 repo_execs=$(echo "${samizdat_initrd_files_dir}"/*)
 
 path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus'
@@ -14,10 +17,10 @@ path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryp
 graft_paths="
     /bin/OpenVT=/bin/openvt
     /bin/LoSetup=/sbin/losetup
-    /patchroot/patchroot.sh=patchroot.sh
+    /patchroot/patchroot.sh=${samizdat_initrd_files_dir}/patchroot.sh
     /patchroot/sources.list=/etc/apt/sources.list
-    /patchroot/initrd-dependencies.txt=initrd-dependencies.txt
-    /lib/samizdat/vol_id.txt=vol_id.txt
+    /patchroot/initrd-dependencies.txt=${samizdat_initrd_files_dir}/initrd-dependencies.txt
+    /lib/samizdat/vol_id.txt=${samizdat_initrd_files_dir}/vol_id.txt
 "
 
 absolute_path_copies='/lib/terminfo/l/linux'
diff --git a/samizdat-paths.sh b/samizdat-paths.sh
deleted file mode 100644
index e417849..0000000
--- a/samizdat-paths.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-samizdat_initrd_files_dir=/home/d/sami/src/initrd
-samizdat_execs_dir=/home/d/src/samizdat
-samizdat_child_dir=/home/d/sami/child
-samizdat_isolinux_dir=/home/d/sami/isolinux
-samizdat_grub_efi_dir=/home/d/sami/grub-efi
-samizdat_iso_dir=/home/d/sami
-PATH=${libexecdir}/${PACKAGE}/bin:${PATH}
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/initrd-dependencies.txt b/src/initrd/initrd-dependencies.txt
index cf73861..cf73861 100644
--- a/initrd-dependencies.txt
+++ b/src/initrd/initrd-dependencies.txt
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/vol_id.txt b/src/initrd/vol_id.txt
index 6633321..6633321 100644
--- a/vol_id.txt
+++ b/src/initrd/vol_id.txt
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