summaryrefslogtreecommitdiff
path: root/initramfs-tools
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2016-04-19 15:41:31 -0400
committerAndrew Cady <d@jerkface.net>2016-04-19 15:41:37 -0400
commit841ae8b1f61449fe78df6835c0a4233266f8baa2 (patch)
tree38ffe6ba50dc69ea3a59bae9061d02e5df7b89fc /initramfs-tools
parent9234bcc7068a456cbf009988fd798c5fd90af0b9 (diff)
make sure real openvt (not busybox) is available and used
this fixes recovery after menu selection (menu is relaunched)
Diffstat (limited to 'initramfs-tools')
-rwxr-xr-xinitramfs-tools/hooks/samizdat4
-rw-r--r--initramfs-tools/scripts/samizdat3
2 files changed, 4 insertions, 3 deletions
diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index edcaea5..3415f18 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -5,10 +5,12 @@
5 5
6for f in ./old-school/*; do copy_exec "$f" /bin; done 6for f in ./old-school/*; do copy_exec "$f" /bin; done
7 7
8path_execs='mountpoint' 8path_execs='mountpoint openvt'
9 9
10for c in $path_execs; do copy_exec "$(which $c)" /bin; done 10for c in $path_execs; do copy_exec "$(which $c)" /bin; done
11 11
12copy_exec /bin/openvt /bin/OpenVT
13
12absolute_path_copies='/lib/terminfo/l/linux' 14absolute_path_copies='/lib/terminfo/l/linux'
13 15
14for f in $absolute_path_copies; do copy_exec "$f" "$f"; done 16for f in $absolute_path_copies; do copy_exec "$f" "$f"; done
diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index 89eb3ab..6d4fe58 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -68,8 +68,7 @@ menutitle()
68 68
69bootmenu() 69bootmenu()
70{ 70{
71 local do_trigger="$1" no_panic="$2" 71 OpenVT -f -c 7 -- dynmenu "$MENUFIFO" &&
72 /bin/openvt -f -c 7 -- dynmenu "$MENUFIFO" &&
73 chvt 7 && 72 chvt 7 &&
74 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.' 73 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.'
75# menutitle 'Samizdat\nfreedom from surveillance\nno trusted authorities' 'Choose an installation target.' 74# menutitle 'Samizdat\nfreedom from surveillance\nno trusted authorities' 'Choose an installation target.'