3 files changed, 48 insertions, 8 deletions

diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index d9e0974..edcaea5 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -3,14 +3,20 @@
 
 . /usr/share/initramfs-tools/hook-functions
 
-for f in ./old-school/*; do
-    copy_exec "$f" /bin
-done
+for f in ./old-school/*; do copy_exec "$f" /bin; done
 
 path_execs='mountpoint'
-for c in $path_execs; do
-    copy_exec "$(which $c)" /bin
-done
+
+for c in $path_execs; do copy_exec "$(which $c)" /bin; done
+
+absolute_path_copies='/lib/terminfo/l/linux'
+
+for f in $absolute_path_copies; do copy_exec "$f" "$f"; done
+
+samizdat_execs_dir=/home/d/src/samizdat # TODO
+samizdat_execs='wait_for_files samizdat-pinentry dynmenu'
+
+for c in $samizdat_execs; do copy_exec ${samizdat_execs_dir}/$c /bin; done
 
 copy_exec vol_id.txt /lib/samizdat/vol_id.txt
 
diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index 3f2ee43..89eb3ab 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -1,3 +1,5 @@
+klogd -c1 # TODO: This should be even earlier.  Can it go on the kernel command line?
+
 mountroot()
 {
   set -x
@@ -16,7 +18,11 @@ mountroot()
   samizdat_install_udev_rules
 
   openvt -c 13 sh
-  sleep 100
+
+  mkfifo "$MENUFIFO" || panic "mkfifo '$MENUFIFO' failed"
+  bootmenu
+
+  sleep 1000
   set +x
 }
 
@@ -40,4 +46,32 @@ samizdat_restart_udev()
   killall systemd-udevd
   /lib/systemd/systemd-udevd --resolve-names=never --debug >/var/log/udevd-systemd.log 2>&1 &
   udevadm hwdb --update  # rule is not executed by 'udevadm trigger' otherwise.  not sure why
+}
+
+
+# TODO: do not duplicate these functions from common.sh
+
+export MENUFIFO=/menu.fifo
+
+addmenu()
+{
+  cat <<END >>$MENUFIFO # mind the tabs
+setItem "$1" "dummy" "$2" "$3"
+END
+}
+
+menutitle()
+{
+  printf 'setTitle "%s"\n' "$1" >>$MENUFIFO
+  printf 'setWelcomeText "%s"\n' "$2" >>$MENUFIFO
+}
+
+bootmenu()
+{
+  local do_trigger="$1" no_panic="$2"
+  /bin/openvt -f -c 7 -- dynmenu "$MENUFIFO" &&
+  chvt 7 &&
+  menutitle 'Samizdat\n\nAs the Internet develops there are\ntransitions in the management arrangements.\nThe time has come to take\na small step in one of those transitions.' 'Choose an installation target.'
+# menutitle 'Samizdat\nfreedom from surveillance\nno trusted authorities' 'Choose an installation target.'
+  addmenu "ramdisk" "[ Boot to RAM without installing anything ]" "menu-select boot-ram"
 }
\ No newline at end of file
diff --git a/old-school/grok-block b/old-school/grok-block
index 3f45bb2..a93cef0 100755
--- a/old-school/grok-block
+++ b/old-school/grok-block
@@ -2,7 +2,7 @@
 . common.sh
 
 DEVNAME=$1
-case "$DEVNAME" in /dev/loop*|/dev/ram*|/dev/dm-*|/dev/md*) exit ;; esac
+case "$DEVNAME" in /dev/loop*|/dev/ram*|/dev/dm-*|/dev/md*|/dev/fd*) exit ;; esac
 [ -b "$DEVNAME" ] || exit
 
 debug_log "grok-block.${DEVNAME##*/}"