fix paths (in progress)

37 files changed, 358 insertions, 231 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..767f5f3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+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
+
+
+bin_programs=xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh btrfs-send-root.sh var.sh
+data_files=
+libexec_programs=grub-efi.sh keygen.sh initrd.sh
+
+install:
+        install ${bin_programs} ${bindir}
+        install ${libexec_programs} ${libexecdir}
+        install ${data_files} ${datadir}/${PACKAGE}
diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index d9d5b5d..eb4497f 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -5,8 +5,9 @@
 CopyExec() { copy_exec "$@" || exit 1; }
 
 . /usr/share/initramfs-tools/hook-functions
+. samizdat-paths.sh
 
-repo_execs=$(echo ./old-school/* loop-layer.sh samizdat-eject.sh)
+repo_execs=$(echo "${samizdat_initrd_files_dir}"/*)
 
 path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus'
 
@@ -22,6 +23,7 @@ graft_paths="
 absolute_path_copies='/lib/terminfo/l/linux'
 
 samizdat_execs='wait_for_files samizdat-pinentry dynmenu src/samizdat-password-agent src/samizdat-gpg-agent'
+for c in $samizdat_execs; do CopyExec ${samizdat_execs_dir}/$c /bin; done
 modules='loop xts dm-crypt hfs hfsplus'
 modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls'
 
@@ -31,8 +33,6 @@ modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls'
 for f in $repo_execs; do CopyExec "$f" /bin; done
 for c in $path_execs; do CopyExec "$(which $c)" /bin; done
 for f in $absolute_path_copies; do CopyExec "$f" "$f"; done
-samizdat_execs_dir=/home/d/src/samizdat # TODO
-for c in $samizdat_execs; do CopyExec ${samizdat_execs_dir}/$c /bin; done
 for m in $modules; do force_load "$m" || exit 1; done
 for dir in $modules_dirs; do copy_modules_dir "$dir" || exit 1; done
 
diff --git a/notes.txt b/notes.txt
deleted file mode 100644
index 1e4f296..0000000
--- a/notes.txt
+++ /dev/null
@@ -1,176 +0,0 @@
-initramfs-tools launches, as pid 1, a script called /init which is used to call
-all of the various configured scripts which are installed into
-'/etc/initramfs-tools/scripts'.
-
-Some of this scripts are executed in subshells, thus they cannot contain the
-final 'pivot_root' (or actually 'switch_root' now), but some of the scripts are
-sourced from the pid1 'sh' process.
-
-There is an environment variable called 'BOOT' which is set to 'local' by
-default and which can be overriden on the kernel command line. The pid1 process
-will source a file named with the value of the 'BOOT' variable:
-
-    # Always load local and nfs (since these might be needed for /etc or
-    # /usr, irrespective of the boot script used to mount the rootfs).
-    . /scripts/local
-    . /scripts/nfs
-    . /scripts/${BOOT}
-
-The BOOT script is used to define functions that will be called within pid1;
-particularly (from '/scripts/local', for example):
-
-
-    mountroot()
-    {
-      local_mount_root
-    }
-
-    mount_top()
-    {
-      # Note, also called directly in case it's overridden.
-      local_top
-    }
-
-    mount_premount()
-    {
-      # Note, also called directly in case it's overridden.
-      local_premount
-    }
-
-    mount_bottom()
-    {
-      # Note, also called directly in case it's overridden.
-      local_bottom
-    }
-
-
-Thus, it should be possible to add a script '/script/samizdat' which overrides
-one of these functions, and then add a BOOT=samizdat parameter.
-
-(Note: the 'local' versions of these scripts merely call 'run_scripts' on
-directories named like '/scripts/local-premount' etc. -- 'run_scripts' runs
-scripts in new processes, it does not source them from pid 1. But see below.)
-
-Almost certainly, the samizdat script should simply define the function 'mountroot'.
-
-Note: if it was desired not to have to set a kernel parameter, it would also be
-possible to 'trick' the system into executing code as pid1 through any script
-called with 'run_scripts' (such as a file placed in '/scripts/local-bottom').
-
-A script called with 'run_scripts' will run in a separate process, but after
-each script is called, pid1 will source the file '/conf/param.conf'.
-
-Thus, to overwrite the mountroot() function, something like this should suffice:
-
-  cat > /conf/mountroot-override <<EOF
-
-  mountroot()
-  {
-    # ...
-  }
-  EOF
-  
-  echo '. /conf/mountroot-override' >> /conf/param.conf
-
-Or even just:
-
-  echo BOOT=samizdat >> /conf/mountroot-override
-
-
-
-
-
-
-This is probably the approach to take:
-
-  Create two scripts:
-
-    /etc/initramfs-tools/scripts/local-bottom/samizdat
-    /etc/initramfs-tools/scripts/samizdat
-
-  The first script just does:
-
-      echo BOOT=samizdat         >> /conf/param.conf
-  
-  The second script calls out to the existing samizdat initrd code. It can even
-  'exec' the original samizdat 'init', although it probably shouldn't.
-
-
-
-
-
-
-Another idea:
-
-
-  The first script waits for a samizdat read-only ISO, then configures the rest
-  of the boot process:
-
-    * Find the btrfs seed filesystem on the ISO
-    * Mount it as a loop device
-    * Add a ramfs to it, making it read-write
-    * Chroot into this system and run code to interact with the user and determine what to do:
-      * Find existing encrypted LUKS partitions
-      * Find existing encrypted GPG keys
-      * Allow the user to decrypt GPG keys -- saving the password in order to restart GPG agent
-      * Allow the user to create a new LUKS partition or choose an existing one
-    * If successful:
-
-      echo BOOT=samizdat         >> /conf/param.conf
-      echo SAMIZDAT_LUKS_DEV=... >> /conf/param.conf   # unencrypted dm dev
-      echo SAMIZDAT_GPG_ID=...   >> /conf/param.conf   # record the user we've authenticated as
-    
-  The second script does the rest of the work:
-  
-    * ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-grepping for param.conf:
-
-/usr/share/initramfs-tools/scripts/local-top/cryptroot:                 # Apparently ROOT is already set in /conf/param.conf for
-/usr/share/initramfs-tools/scripts/local-top/cryptroot:                 if [ -f /conf/param.conf ] && grep -q "^ROOT=" /conf/param.conf; then
-/usr/share/initramfs-tools/scripts/local-top/cryptroot:                         NEWROOT=$(sed -n 's/^ROOT=//p' /conf/param.conf)
-/usr/share/initramfs-tools/scripts/local-top/cryptroot:                                 echo "ROOT=$NEWROOT" >>/conf/param.conf
-/usr/share/initramfs-tools/hook-functions:              echo "[ -e /conf/param.conf ] && . /conf/param.conf" >> ${initdir}/ORDER
-/usr/share/initramfs-tools/hook-functions:              if [ -e /conf/param.conf ]; then
-/usr/share/initramfs-tools/hook-functions:                      . /conf/param.conf
-
-Relevant instances of 'run_scripts':
-
-      Definition:
-
-        /usr/share/initramfs-tools/scripts/functions:run_scripts()
-
-      Uses in pid1:
-
-        /usr/share/initramfs-tools/init:run_scripts /scripts/init-top
-        /usr/share/initramfs-tools/init:run_scripts /scripts/init-premount
-        /usr/share/initramfs-tools/init:run_scripts /scripts/init-bottom
-
-      Uses in 'local':
-
-        /usr/share/initramfs-tools/scripts/local:               run_scripts /scripts/local-top
-        /usr/share/initramfs-tools/scripts/local:       run_scripts /scripts/local-block "$@"
-        /usr/share/initramfs-tools/scripts/local:               run_scripts /scripts/local-premount
-        /usr/share/initramfs-tools/scripts/local:               run_scripts /scripts/local-bottom
-      
-        Note that 'local' is unconditionally executed in init:
-        
-
-
-      Panic hooks:
-
-        /usr/share/initramfs-tools/scripts/functions:   run_scripts /scripts/panic
diff --git a/notes/btrfs-test.sh b/notes/btrfs-test.sh
new file mode 100644
index 0000000..62cab9a
--- /dev/null
+++ b/notes/btrfs-test.sh
@@ -0,0 +1,282 @@
+#!/bin/sh
+
+. ./var.sh
+. ./btrfs-functions.sh
+
+create_image()
+{
+    $(ARGS_NE megs filename)
+    [ ! -e "$filename" ] || return
+    truncate -s "$megs"M "$filename"
+}
+
+make_seed_fs()
+{
+    $(ARGS_NE input_dir img)
+    local mountpoint dev seed_subvol root_subvol
+
+    mountpoint=$img.mnt
+    mkdir "$mountpoint"                    || die 'mkdir failed'
+    dev=$(lodev "$img")                    || die 'lodev failed'
+    mkfs.btrfs "$dev"                      || die 'mkfs failed'
+    mount "$dev" "$mountpoint"             || die 'mount failed'
+
+    seed_subvol=$mountpoint/SEED
+    root_subvol=$mountpoint/ROOT
+    btrfs subvolume create "$root_subvol"                     || die
+    rsync -aP "$input_dir"/ "$root_subvol"/                   || die 'rsync failed'
+    btrfs subvolume snapshot -r "$root_subvol" "$seed_subvol" || die
+    btrfs_subvolume_set_default "$root_subvol" || die
+
+    umount "$mountpoint"                   || die 'umount failed'
+    rmdir "$mountpoint"
+    btrfstune -S 1 "$dev"                  || die 'btrfstune failed'
+    unlodev "$dev"
+}
+
+btrfs_subvolume_set_default()
+{
+    $(ARGS_NE path)
+    local subvol_id
+    subvol_id=$(btrfs_show_subvolume_id "$path")       || return
+    btrfs subvolume set-default "$subvol_id" "$path"
+}
+
+loop_is_attached()
+{
+    [ "$(losetup -l  "$1" -O BACK-FILE -n 2>/dev/null)" ]
+}
+
+lodev() { lodev_helper false "$@"; }
+lodev_readonly() { lodev_helper true "$@"; }
+
+lodev_helper()
+{
+    $(ARGS_NE readonly img)
+    local link b dev opt_ro
+    link=$img.b
+    if $readonly; then
+        opt_ro=-r
+    else
+        opt_ro=
+    fi
+    if [ -L "$link" ]; then
+        b="$(readlink "$link")"
+        loop_is_attached "$b" || losetup $opt_ro "$b" "$img" || return
+    else
+        dev=$(unused_dev) || return
+        losetup $opt_ro "$dev" "$img" || return
+        ln -sf "$dev" "$img".b || return
+    fi >/dev/null
+    printf '%s\n' $link
+}
+
+unused_dev()
+{
+    local do_not_use f d no
+    do_not_use=$(for f in *.b; do [ -L "$f" ] || continue; readlink $f; done)
+    for n in $(seq 10 20); do
+        d=/dev/loop$n
+        for no in $do_not_use; do
+            [ "$d" != "$no" ] || continue 2
+        done
+        echo $d
+        return
+    done
+}
+
+unlodev()
+{
+    $(ARGS_NE link)
+    [ -L "$link" ] || return
+    losetup -d "$(readlink "$link")" # && rm -f "$link"
+}
+
+plant_seed()
+{
+    $(ARGS_NE seed_img overlay_img mountpoint)
+    local overlay_dev seed_dev
+
+    overlay_dev=$(lodev "$overlay_img")             || die 'lodev failed'
+    seed_dev=$(lodev_readonly "$seed_img")          || die 'lodev failed'
+
+    mount "$seed_dev" "$mountpoint"                 || die 'mount failed'
+
+    btrfs device add "$overlay_dev" "$mountpoint"   || die 'btrfs-device-add failed'
+    mount -o rw,remount "$mountpoint"               || die 'remount failed'
+    btrfs device delete "$seed_dev" "$mountpoint"   || die 'btrfs-device-delete failed'
+
+    unlodev "$seed_dev"
+
+    umount "$mountpoint"
+    unlodev "$overlay_dev"
+}
+
+generate_seed_helper()
+{
+    $(ARGS_NE seed_layer keep_old_seeds size seed_img snapshot_mountpoint overlay_img_output)
+    local mountpoint overlay_dev seed_dev snapshot_default
+    mountpoint=${overlay_img_output}.mnt
+
+    mountpoint -q "$snapshot_mountpoint" || die
+    [ -d "$mountpoint" ]  || mkdir "$mountpoint" || die
+
+    filemaker "$overlay_img_output" create_image "$size" || die
+
+    overlay_dev=$(lodev "$overlay_img_output") || die
+    seed_dev=$(lodev_read_only "$seed_img") || die
+
+    mount -o subvol=/ "$seed_dev" "$mountpoint" || die
+    btrfs device add "$overlay_dev" "$mountpoint" || die
+    mount -o rw,remount "$mountpoint" || die
+
+    snapshot_default=$(btrfs_show_default_path "$snapshot_mountpoint") || die
+
+    push_simple "$snapshot_mountpoint"/SEED_NEW "$snapshot_mountpoint"/SEED "$snapshot_default" "$mountpoint"
+
+    if $keep_old_seeds; then
+        sex mv -T --backup=numbered "$mountpoint"/SEED_NEW "$mountpoint"/SEED || die
+    else
+        btrfs subvolume delete "$mountpoint"/SEED || die
+        sex mv "$mountpoint"/SEED_NEW "$mountpoint"/SEED || die
+    fi
+
+    if ! $seed_layer; then
+        btrfs device remove "$seed_dev" "$mountpoint" || die
+    fi
+
+    umount "$mountpoint" || die
+    rmdir "$mountpoint"
+
+    btrfstune -S 1 "$overlay_img_output"                  || die 'btrfstune failed'
+}
+
+generate_seed_overlay() # NB. uses non-local variables set in <..>_helper
+{
+    generate_seed_helper true true "$@"
+}
+
+regenerate_toplevel_seed()
+{
+    generate_seed_helper false true "$@"
+}
+
+regenerate_from_master()
+{
+    regenerate_toplevel_seed 256 seed.img master overlay.img
+    remove_image seed.img || die
+    mv overlay.img seed.img || die
+    mv overlay.img.b seed.img.b || die
+}
+
+plant_seed_mount()
+{
+    plant_seed "$1" "$2" "$3"
+    mount "$(lodev "$2")" "$3"
+}
+
+plant_seed_mount_rootvol()
+{
+    plant_seed "$1" "$2" "$3"
+    mount -o subvol=/ "$(lodev "$2")" "$3"
+}
+
+remove_image()
+{
+    unlodev "$1.b"
+    rm -f "$1" "$1.b"
+}
+
+IMAGES='master.img slave.img seed.img overlay.img'
+MNTPOINTS='master slave/mnt slave seed.img.mnt overlay.img.mnt'
+
+mounter()
+{
+    $(ARGS_NE mp)
+    shift
+    mountpoint -q "$mp" && return
+    mkdir "$mp" 2>/dev/null
+    "$@" "$mp"
+}
+
+filemaker()
+{
+    $(ARGS_NE f)
+    shift
+    [ -f "$f" ] && return
+    ! [ -e "$f" ] || return
+    "$@" "$f"
+}
+
+in_dir()
+{
+    (set -e
+     cd "$1"
+     shift
+     "$@")
+}
+
+pull()
+{
+    $(ARGS_NE mnt src dst)
+    local src_subvol
+    src_subvol=$(btrfs_show_default_path "$src") || die
+
+    die 'unimplemented'
+}
+
+push_slave()
+{
+    local mnt img img_dev
+    mnt=slave/mnt
+    img=slave.img
+    mkdir "$mnt" 2>/dev/null
+    img_dev=$(lodev "$img") || die
+    mounter "$mnt" mount -o subvol=/ "$img_dev" || die
+
+    push "$mnt" slave master
+    umount "$mnt"
+    losetup -D
+}
+
+main()
+{
+    local img
+
+    mkdir inp
+    touch inp/file.txt
+
+    for img in $IMAGES; do
+        filemaker $img create_image 256 || die            # Note: btrfs kernel task hangs if image is too small!
+    done
+
+    make_seed_fs inp seed.img || die
+
+    mounter slave   plant_seed_mount         seed.img slave.img
+    mounter master  plant_seed_mount_rootvol seed.img master.img
+}
+
+cleanup()
+{
+    local img m
+
+    for img in $IMAGES; do
+        remove_image "$img"
+    done
+    for m in $MNTPOINTS; do
+        umount "$m" 2>/dev/null
+        rmdir "$m" 2>/dev/null
+    done
+    losetup -D 2>/dev/null
+    true
+}
+
+case "$1" in
+    clean|cleanup) cleanup ;;
+    testclean) main; cleanup ;;
+    cleantest) cleanup; main ;;
+    push) push_slave ;;
+    regen) regenerate_from_master ;;
+    '') main ;;
+    *) die "Unknown command: $1" ;;
+esac
diff --git a/notes/xorriso-patch.sh b/notes/xorriso-patch.sh
new file mode 100644
index 0000000..47a9934
--- /dev/null
+++ b/notes/xorriso-patch.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+exit
+# This kept the ISO bootable:
+
+xorriso -drive_class clear_list all \
+        -indev debian-live-8.4.0-amd64-standard.iso \
+        -outdev test3.iso \
+        -rm_r live install pool -- \
+        -pathspecs on \
+        -add live=isolinux/live/ isolinux/pxelinux.* isolinux/*.cfg -- \
+        -boot_image isolinux patch
diff --git a/samizdat-paths.sh b/samizdat-paths.sh
new file mode 100644
index 0000000..e417849
--- /dev/null
+++ b/samizdat-paths.sh
@@ -0,0 +1,7 @@
+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/btrfs-functions.sh b/src/btrfs-functions.sh
index b83b94d..b83b94d 100644
--- a/btrfs-functions.sh
+++ b/src/btrfs-functions.sh
diff --git a/btrfs-receive-root.sh b/src/btrfs-receive-root.sh
index f553c2c..f553c2c 100644
--- a/btrfs-receive-root.sh
+++ b/src/btrfs-receive-root.sh
diff --git a/btrfs-send-root.sh b/src/btrfs-send-root.sh
index 25e60f2..8a3a513 100644
--- a/btrfs-send-root.sh
+++ b/src/btrfs-send-root.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
-. ./var.sh
-. ./btrfs-functions.sh
+. samizdat-paths.sh
+. var.sh
+. btrfs-functions.sh
 
 rootfs_uuid ()
 {
diff --git a/grub-efi.sh b/src/grub-efi.sh
index 76ee34a..e2d50f6 100755
--- a/grub-efi.sh
+++ b/src/grub-efi.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
+. samizdat-paths.sh
+
 grub_config()
 {
     cat <<EOF
@@ -29,8 +31,8 @@ boot
 EOF
 }
 
-real_destdir=grub-efi
-destdir=grub-efi.tmp
+real_destdir=$samizdat_grub_efi_dir
+destdir=$real_destdir.tmp
 
 set -e
 rm -r "${destdir}" 2>/dev/null || true
diff --git a/initrd.sh b/src/initrd.sh
index 252763b..8cc8ea1 100755
--- a/initrd.sh
+++ b/src/initrd.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-initrd=isolinux/linux/initrd.img
-vmlinuz=isolinux/linux/vmlinuz
+initrd=${samizdat_isolinux_dir}/linux/initrd.img
+vmlinuz=${samizdat_isolinux_dir}/linux/vmlinuz
 
 version=$(uname -r)
 version=4.5.0-0.bpo.1-amd64
diff --git a/old-school/common.sh b/src/initrd/common.sh
index 4aa8528..4aa8528 100644
--- a/old-school/common.sh
+++ b/src/initrd/common.sh
diff --git a/old-school/grok-block b/src/initrd/grok-block
index 75d5120..75d5120 100755
--- a/old-school/grok-block
+++ b/src/initrd/grok-block
diff --git a/old-school/halt.montecarlo b/src/initrd/halt.montecarlo
index 67dac17..67dac17 100755
--- a/old-school/halt.montecarlo
+++ b/src/initrd/halt.montecarlo
diff --git a/old-school/init b/src/initrd/init
index 3b62c0a..3b62c0a 100755
--- a/old-school/init
+++ b/src/initrd/init
diff --git a/old-school/init.functions b/src/initrd/init.functions
index 7209b04..7209b04 100644
--- a/old-school/init.functions
+++ b/src/initrd/init.functions
diff --git a/old-school/init.shutdown b/src/initrd/init.shutdown
index 6bfce84..6bfce84 100755
--- a/old-school/init.shutdown
+++ b/src/initrd/init.shutdown
diff --git a/loop-layer.sh b/src/initrd/loop-layer.sh
index 7e08e12..7e08e12 100644
--- a/loop-layer.sh
+++ b/src/initrd/loop-layer.sh
diff --git a/old-school/lvm-create.sh b/src/initrd/lvm-create.sh
index d4a8bdf..d4a8bdf 100644
--- a/old-school/lvm-create.sh
+++ b/src/initrd/lvm-create.sh
diff --git a/old-school/lvm.conf b/src/initrd/lvm.conf
index 0c1289f..0c1289f 100644
--- a/old-school/lvm.conf
+++ b/src/initrd/lvm.conf
diff --git a/old-school/mdadm-dup.sh b/src/initrd/mdadm-dup.sh
index 70163a5..70163a5 100644
--- a/old-school/mdadm-dup.sh
+++ b/src/initrd/mdadm-dup.sh
diff --git a/old-school/menu-select b/src/initrd/menu-select
index f059052..f059052 100755
--- a/old-school/menu-select
+++ b/src/initrd/menu-select
diff --git a/old-school/samizdat-cdrom-copy b/src/initrd/samizdat-cdrom-copy
index d4920b9..d4920b9 100755
--- a/old-school/samizdat-cdrom-copy
+++ b/src/initrd/samizdat-cdrom-copy
diff --git a/samizdat-eject.sh b/src/initrd/samizdat-eject.sh
index d95a49d..d95a49d 100755
--- a/samizdat-eject.sh
+++ b/src/initrd/samizdat-eject.sh
diff --git a/old-school/squashfs-size b/src/initrd/squashfs-size
index 74b67d7..74b67d7 100755
--- a/old-school/squashfs-size
+++ b/src/initrd/squashfs-size
diff --git a/old-school/umountall.sh b/src/initrd/umountall.sh
index bf89838..bf89838 100755
--- a/old-school/umountall.sh
+++ b/src/initrd/umountall.sh
diff --git a/old-school/vol_id b/src/initrd/vol_id
index 5cd24a1..5cd24a1 100755
--- a/old-school/vol_id
+++ b/src/initrd/vol_id
diff --git a/keygen.sh b/src/keygen.sh
index 716359b..716359b 100755
--- a/keygen.sh
+++ b/src/keygen.sh
diff --git a/patchroot.sh b/src/patchroot.sh
index 738beac..738beac 100755
--- a/patchroot.sh
+++ b/src/patchroot.sh
diff --git a/qemu.sh b/src/qemu.sh
index 5553e7b..dfed521 100755
--- a/qemu.sh
+++ b/src/qemu.sh
@@ -1,25 +1,27 @@
 #!/bin/sh
 
+. samizdat-path.sh
+
 # iso=debian-live-8.4.0-amd64-gnome-desktop.iso
 # iso=debian-live-8.4.0-amd64-standard.iso
 # iso=debian-live-8.4.0-amd64-standard.btrfs.iso
-iso=samizdat.iso
-disk=debian-live-8.4.0-amd64-standard.btrfs.disk
-layered=${iso%.iso}.layered.iso
+iso=${samizdat_iso_dir}/samizdat.iso
+disk=${samizdat_iso_dir}/debian-live-8.4.0-amd64-standard.btrfs.disk
+layered=${samizdat_iso_dir}/${iso%.iso}.layered.iso
 
 [ -f "$layered" ] && iso=$layered
 
 [ "$1" ] && iso=$1
 
-./initrd.sh || { echo "./initrd.sh failed" >&2; exit 1; };
+initrd.sh || { echo "initrd.sh failed" >&2; exit 1; };
 
 NET='tap,vlan=0,ifname=tap0,script=no,downscript=no'
 
 # To test local pxe boot server:
 # NET='user,tftp=isolinux,bootfile=/pxelinux.0'
 
-initrd=isolinux/linux/initrd.img
-kernel=isolinux/linux/vmlinuz
+initrd=${samizdat_isolinux_dir}/linux/initrd.img
+kernel=${samizdat_isolinux_dir}/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/src/samizdat-paths.sh b/src/samizdat-paths.sh
new file mode 100644
index 0000000..c437c5b
--- /dev/null
+++ b/src/samizdat-paths.sh
@@ -0,0 +1,5 @@
+samizdat_initrd_files_dir=/home/d/sami/src/initrd
+samizdat_execs_dir=/home/d/src/samizdat
+samizdat_child_dir=./child
+samizdat_isolinux_dir=/home/d/sami/isolinux
+PATH=${libexecdir}/${PACKAGE}/bin:${PATH}
diff --git a/var.sh b/src/var.sh
index d0c7df5..d0c7df5 100644
--- a/var.sh
+++ b/src/var.sh
diff --git a/xorriso-layer.sh b/src/xorriso-layer.sh
index 7ce4776..7ce4776 100755
--- a/xorriso-layer.sh
+++ b/src/xorriso-layer.sh
diff --git a/xorriso-usb.sh b/src/xorriso-usb.sh
index 3f7df8e..61fcda0 100755..100644
--- a/xorriso-usb.sh
+++ b/src/xorriso-usb.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
 
+. samizdat-paths.sh || exit 1
+
 outdev=
 volid=SamizdatLive
 gpg_iso_path=gnupghome
 gnupghome=
-secrets=secrets
-child_dir=./child
-vmlinuz_dir=isolinux/linux
+child_dir=$samizdat_child_dir
+vmlinuz_dir=$samizdat_isolinux_dir
+efi_dir=$samizdat_grub_efi_dir
 
 die() { printf "%s: Error: %s\n" "$0" "$*" >&2; exit 1; }
 
@@ -104,7 +106,7 @@ generate_keys()
         kiki init || die 'kiki init failed'
         gnupghome=/root/.gnupg
     else
-        ./keygen.sh "$child_dir" || die "keygen.sh failed"
+        keygen.sh "$child_dir" || die "keygen.sh failed"
         gnupghome=$child_dir/root/.gnupg
         trap 'umount "$child_dir"; rmdir "$child_dir"' EXIT
     fi
@@ -113,9 +115,7 @@ generate_keys()
 
 [ "$(id -u)" = 0 ] || die "you are not root."
 
-if [ grub-efi.sh -nt grub-efi ]; then
-    ./grub-efi.sh || die "grub-efi.sh failed"
-fi
+grub-efi.sh || die "grub-efi.sh failed"
 
 choose_outdev
 
@@ -137,7 +137,7 @@ if [ "$QUICK_TEST" ]; then
 fi
 
 if [ "$REPLACE_INITRD" ]; then
-    ./initrd.sh
+    initrd.sh
 fi
 
 (set -x
@@ -168,9 +168,9 @@ xorriso \
         -as mkisofs -graft-points \
         -b grub/i386-pc/eltorito.img  \
         -no-emul-boot -boot-info-table \
-        --embedded-boot grub-efi/embedded.img \
+        --embedded-boot "${efi_dir}"/embedded.img \
         --protective-msdos-label \
-        grub=grub-efi/grub
+        grub="${efi_dir}"/grub
 ) || die "xorriso exited $?"
 
 case "$outdev" in
diff --git a/xorriso.sh b/src/xorriso.sh
index 5068d4b..5068d4b 100755
--- a/xorriso.sh
+++ b/src/xorriso.sh
diff --git a/xorriso.test-efi.sh b/src/xorriso.test-efi.sh
index 3591528..3591528 100755
--- a/xorriso.test-efi.sh
+++ b/src/xorriso.test-efi.sh
diff --git a/update-initramfs.conf b/update-initramfs.conf
deleted file mode 100644
index ce86f30..0000000
--- a/update-initramfs.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Configuration file for update-initramfs(8)
-#
-
-#
-# update_initramfs [ yes | all | no ]
-#
-# Default is yes
-# If set to all update-initramfs will update all initramfs
-# If set to no disables any update to initramfs beside kernel upgrade
-
-update_initramfs=yes
-
-#
-# backup_initramfs [ yes | no ]
-#
-# Default is no
-# If set to no leaves no .bak backup files.
-
-backup_initramfs=no
-
-if [ "$SAMIZDAT_UPDATE_INITRAMFS_ROOT" ]; then
-        STATEDIR="$SAMIZDAT_UPDATE_INITRAMFS_ROOT"/var/lib/initramfs-tools
-        BOOTDIR="$SAMIZDAT_UPDATE_INITRAMFS_ROOT"/boot
-        test -d "$SAMIZDAT_UPDATE_INITRAMFS_ROOT" || {
-                echo "$0: Error: not a directory: ${SAMIZDAT_UPDATE_INITRAMFS_ROOT}" >&2
-                exit 1
-        }
-        mkdir -p "$STATEDIR" "$BOOTDIR"
-fi