remove more samizdat-paths cruft

6 files changed, 17 insertions, 194 deletions

diff --git a/Makefile b/Makefile
index b6ed4b6..6aff815 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ INSTALL_SUBMODULES = fsmgr
 NO_INSTALL_SUBMODULES = cryptonomic-dyndns-server
 SUBMODULES = $(INSTALL_SUBMODULES) $(NO_INSTALL_SUBMODULES)
 
-all: samizdat-paths.sh ${compiled_programs} ${SUBMODULES}
+all: ${compiled_programs} ${SUBMODULES}
 
 .PHONY: stack install-stack
 install-stack:
@@ -37,24 +37,21 @@ wait_for_files: src/wait_for_files.c | build-deps
 %: src/%.c | build-deps
         $(CC) $(CFLAGS)  $< -o $@
 
-src_bin_programs = btrfs-functions.sh var.sh dnsmasq-dhcp-script.sh usb partvi
+src_bin_programs = btrfs-functions.sh var.sh usb partvi
 
-bin_programs=$(addprefix src/, $(src_bin_programs)) samizdat-paths.sh ${cc_files} ${btrfs_utils}
+bin_programs=$(addprefix src/, $(src_bin_programs)) ${cc_files} ${btrfs_utils}
 
 btrfs_utils=$(addprefix src/btrfs-utils/, btarfs with-btrfs-seed)
 
-initrd_files:=$(wildcard src/initrd/*) dynmenu samizdat-pinentry wait_for_files
+initrd_files:=$(wildcard src/initrd/*) dynmenu wait_for_files
 initramfs_conf_files:=$(wildcard initramfs-tools/*)
 
 isolinux_files:=$(wildcard isolinux/*)
 
 clean:
-        rm -f samizdat-paths.sh ${compiled_programs}
+        rm -f ${compiled_programs}
 
 .PHONY: all clean
-samizdat-paths.sh: src/samizdat-paths.in
-        @sed -e "s?PREFIX?$(prefix)?g" $< > $@
-include samizdat-paths.sh
 
 install-nested-kvm: conf/kvm.conf
         install -m0644 conf/kvm.conf ${instdir}/etc/modprobe.d/
@@ -149,23 +146,6 @@ boot: rootfs
         sudo update-initramfs -u
         sudo ROOTFS=$(rootfs) ./src/parted-usb.sh
 
-fastboot: rootfs
-        sudo qemu.sh
-
-samizdat.netinst.iso: | $(rootfs)
-        exit 1; sudo initrd.sh
-        sudo xorriso-usb.sh $(reuse_child) --bootloader --out $@
-
-cleantest:
-        make testclean
-        make isotest
-
-isotest: samizdat.iso
-        USE_ISO=y SLOW_BOOT=y NO_NET=y qemu.sh $^
-
-isotest-netinst: samizdat.netinst.iso
-        USE_ISO=y SLOW_BOOT=y qemu.sh $^
-
 samizdat_btrfs_patch_size=256M
 
 get_loop_dev="$$(sudo losetup -n -O name -j $@~tmp)"
@@ -229,23 +209,22 @@ build-submodules-stamp: build-submodules
 install-submodules-stamp: install-submodules
         touch $@
 
+bindir = /usr/local/bin
+
 install-bin-programs: ${bin_programs}
-        install -D -p -t ${instdir}${samizdat_bindir} ${bin_programs}
+        install -D -p -t ${instdir}${bindir} ${bin_programs}
 
 CP=cp --preserve=timestamps -r
 
 defaults_conf_files = conf/grub.default
 initramfs_conf_files = $(addprefix initramfs-tools/,hooks/samizdat scripts/samizdat)
-install-stamp: install-bin-programs samizdat-paths.sh ${compiled_programs}
+install-stamp: install-bin-programs ${compiled_programs}
         install -m644 --backup=t -t /etc/apt/sources.list.d -- conf/bookworm.list
         install -m644 --backup=t -T -- conf/grub.default /etc/default/grub
         install -t /etc/initramfs-tools/hooks   -- initramfs-tools/hooks/samizdat
         install -t /etc/initramfs-tools/scripts -- initramfs-tools/scripts/samizdat
         touch $@
 
-bootclean:
-        rm -f samizdat.disk.img boot-disk.template.img boot-disk.img
-
 .PHONY: update upgrade up upgrade-key initrd
 
 initrd: install
diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index b6451eb..1d4c1fe 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -1,32 +1,29 @@
 #!/bin/sh
-# TODO: check samizdat source to see what it copies
 [ "$1" = prereqs ] && { echo; exit; }
 
+. /usr/share/initramfs-tools/hook-functions
+
 die() { printf 'Error: generating initramfs: %s\n' "$*" >&2; exit 1; }
 
 CopyExec() { copy_exec "$@" || die "failed to copy_exec $*"; }
 CopyExecE() { [ "$2" ] || die "cannot find binary to copy: $1"; shift; CopyExec "$@"; }
 
-. /usr/share/initramfs-tools/hook-functions
-PATH=/usr/local/lib/samizdat-rhizome/initrd:/usr/local/bin:$PATH
-. samizdat-paths.sh
+SAMIZDAT_INITRD_PATH=/usr/local/lib/samizdat-rhizome/initrd
+
+PATH=${SAMIZDAT_INITRD_PATH}:/usr/local/bin:$PATH
 
-repo_execs=$(echo "${samizdat_initrd_files_dir}"/*)
+repo_execs=$(echo "${SAMIZDAT_INITRD_PATH}"/*)
 
 path_execs='
     mountpoint openvt rsync gpg2 pinentry-curses truncate dmsetup
     dmstats cryptsetup mkfs.btrfs btrfs fsck.hfsplus wait_for_files
-    samizdat-pinentry dynmenu samizdat-password-agent samizdat-gpg-agent
-    parted fallocate strace btrfstune sfdisk
+    dynmenu parted fallocate strace btrfstune sfdisk
 '
 
 graft_paths="
     /bin/OpenVT=/bin/openvt
     /bin/LoSetup=/sbin/losetup
-    /patchroot/patchroot.sh=${samizdat_initrd_files_dir}/patchroot.sh
-    /patchroot/sources.list=/etc/apt/sources.list
-    /patchroot/initrd-dependencies.txt=${samizdat_initrd_files_dir}/initrd-dependencies.txt
-    /lib/samizdat/vol_id.txt=${samizdat_initrd_files_dir}/vol_id.txt
+    /patchroot/patchroot.sh=${SAMIZDAT_INITRD_PATH}/patchroot.sh
 "
 
 absolute_path_copies='/lib/terminfo/l/linux /usr/bin/gpg-agent'
diff --git a/src/btrfs-send-root.sh b/src/btrfs-send-root.sh
deleted file mode 100644
index 8a3a513..0000000
--- a/src/btrfs-send-root.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-. samizdat-paths.sh
-. var.sh
-. btrfs-functions.sh
-
-rootfs_uuid ()
-{
-    btrfs filesystem show / | sed -ne 's/.*uuid: //p'
-}
-
-remote_btrfs_receiver()
-{
-#   ssh "$BTRFS_RECEIVE_DESTINATION_HOST" -- "sudo btrfs receive $(shellescape "$BTRFS_RECEIVE_DESTINATION_PATH")"
-    ssh "$BTRFS_RECEIVE_DESTINATION_HOST" -- \
-        "sudo sh sami/btrfs-receive-root.sh $(shellescape "$BTRFS_RECEIVE_DESTINATION_PATH") $(shellescape "$BTRFS_RECEIVE_SUBVOLUME_NAME")"
-}
-
-dummy_receiver()
-{
-    true
-}
-
-push_remote()
-{
-    $(ARGS_NE mnt src ssh_dst)
-
-    now=$(date +%F.%H%M%S) || die
-    snap_dir=$mnt/snapshot.$now
-    prev_dir=$mnt/SEED
-
-    case "$ssh_dst" in
-        *:*) ;;
-        *) return 1;;
-    esac
-    local BTRFS_RECEIVE_DESTINATION_PATH="${ssh_dst#*:}"
-    local BTRFS_RECEIVE_DESTINATION_HOST="${ssh_dst%%:*}"
-    local BTRFS_RECEIVE_SUBVOLUME_NAME="${snap_dir#$mnt/}"
-    push_helper false "$snap_dir" "$prev_dir" "$src" remote_btrfs_receiver
-}
-
-ssh_dst=d@fifty.local:sami/test_dest
-
-mkdir -p /mnt/rootfs || die
-mountpoint -q /mnt/rootfs || mount -o subvol=/ UUID=$(rootfs_uuid) /mnt/rootfs || die
-push_remote /mnt/rootfs / "$ssh_dst"
diff --git a/src/dnsmasq-dhcp-script.sh b/src/dnsmasq-dhcp-script.sh
deleted file mode 100644
index 7469447..0000000
--- a/src/dnsmasq-dhcp-script.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-[ "$1" = tftp ] || exit 0
-. samizdat-paths.sh
-TFTP_ROOT=${samizdat_isolinux_dir}
-TFTP_FILE=$4
-TFTP_FILE_SIZE=$3
-CLIENT_IP=$3
-
-# dnsmasq clears the environment.  kiki needs at least $HOME
-export USER=root
-export MAIL=/var/mail/root
-export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-export LANG=en_US.UTF-8
-export HOME=/root
-export LANGUAGE=en_US:en
-export LOGNAME=root
-
-debug()
-{
-    LOGDIR=/var/log/dnsmasq-dhcp-script
-    mkdir -p "$LOGDIR"
-    exec > "$LOGDIR/$$.log" 2>&1
-    set -x
-}
-
-new_child()
-{
-    child_dir=$samizdat_child_dir/child.$$
-    if [ -d "$child_dir" ]; then
-        rmdir "$child_dir" || exit 1
-    fi
-
-    sh -x "$(which keygen.sh)" "$child_dir" || return
-    tar --exclude '*~' -zcf "$child_dir"/gnupghome.tar -C "$child_dir"/root/.gnupg . || return
-
-    tftp_dir="${TFTP_ROOT}"/"$CLIENT_IP"
-    if [ ! -d "$tftp_dir" ]; then
-        ATOMIC=y
-        dest_dir="$tftp_dir"~
-
-        # DNSMASQ DOCUMENTATION IS WRONG OMFG
-        # Otherwise this symlink farm would be unnecessary
-
-        mkdir -p "$dest_dir"
-        (cd "$dest_dir" && ln -sf ../* . && rm "$CLIENT_IP"~) || return
-    else
-        dest_dir="$tftp_dir"
-    fi
-
-    chown dnsmasq "$child_dir" "$child_dir"/gnupghome.tar
-    ln -sf "$child_dir"/gnupghome.tar "$dest_dir"/
-
-    if [ "$ATOMIC" ]; then
-        mv -T "$dest_dir" "$tftp_dir"
-    fi
-}
-
-cleanup_after_fail()
-{
-    umount "$child_dir"
-    rmdir "$child_dir"
-}
-
-exit_unless_needed()
-{
-
-    case "$TFTP_FILE" in
-        "${TFTP_ROOT}/linux/vmlinuz")
-        ;;
-        "${TFTP_ROOT}/${CLIENT_IP}/linux/vmlinuz")
-            [ -e "${TFTP_ROOT}/${CLIENT_IP}/gnupghome.tar" ] && exit
-        ;;
-        *) exit
-        ;;
-    esac
-}
-
-exit_unless_needed
-
-debug
-
-(new_child || cleanup_after_fail) &
diff --git a/src/samizdat-paths.in b/src/samizdat-paths.in
deleted file mode 100644
index c3037d3..0000000
--- a/src/samizdat-paths.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# Note: this file is both shell script and make file
-
-samizdat_libdir=PREFIX/lib/samizdat-rhizome
-samizdat_bindir=PREFIX/bin
-
-  samizdat_initrd_files_dir=${samizdat_libdir}/initrd
-         samizdat_child_dir=${samizdat_libdir}/child
-      samizdat_isolinux_dir=${samizdat_libdir}/isolinux
-         samizdat_linux_dir=${samizdat_libdir}/isolinux/linux
-      samizdat_grub_efi_dir=${samizdat_libdir}/grub-efi
-samizdat_initramfs_conf_dir=/etc/initramfs-tools
-
-samizdat_iso_dir=.
diff --git a/src/samizdat-paths.sh b/src/samizdat-paths.sh
deleted file mode 100644
index 6548564..0000000
--- a/src/samizdat-paths.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# Note: this file is both shell script and make file
-samizdat_libdir=/usr/local/lib/samizdat-rhizome
-samizdat_bindir=/usr/local/bin
-
-  samizdat_initrd_files_dir=${samizdat_libdir}/initrd
-         samizdat_child_dir=${samizdat_libdir}/child
-      samizdat_isolinux_dir=${samizdat_libdir}/isolinux
-         samizdat_linux_dir=${samizdat_libdir}/isolinux/linux
-      samizdat_grub_efi_dir=${samizdat_libdir}/grub-efi
-samizdat_initramfs_conf_dir=${samizdat_libdir}/initramfs-tools
-
-samizdat_iso_dir=.
-samizdat_execs_dir=${samizdat_bindir}