diff options
Diffstat (limited to 'src/initrd/menu-select')
-rwxr-xr-x | src/initrd/menu-select | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/initrd/menu-select b/src/initrd/menu-select index c374b29..1fcade4 100755 --- a/src/initrd/menu-select +++ b/src/initrd/menu-select | |||
@@ -18,6 +18,7 @@ error() | |||
18 | 18 | ||
19 | clear >&4 | 19 | clear >&4 |
20 | echo "error -- ${*:-:(}" >&4 | 20 | echo "error -- ${*:-:(}" >&4 |
21 | echo "error -- ${*:-:(}" >/dev/tty1 | ||
21 | 22 | ||
22 | if [ $sleep -gt 0 ]; then | 23 | if [ $sleep -gt 0 ]; then |
23 | echo "will try again in $sleep seconds..." >&4 | 24 | echo "will try again in $sleep seconds..." >&4 |
@@ -61,6 +62,8 @@ hwclock_to_system() | |||
61 | hwclock --hctosys | 62 | hwclock --hctosys |
62 | } | 63 | } |
63 | 64 | ||
65 | chvt 1 | ||
66 | echo -n "Samizdat is attempting to load the root filesystem..." >/dev/tty1 | ||
64 | case "$1" in | 67 | case "$1" in |
65 | boot-ram) | 68 | boot-ram) |
66 | read _ memtotal_kb _ < /proc/meminfo | 69 | read _ memtotal_kb _ < /proc/meminfo |
@@ -107,7 +110,7 @@ case "$1" in | |||
107 | mount "$dev"2 /plaintext || error | 110 | mount "$dev"2 /plaintext || error |
108 | init_gpg || error | 111 | init_gpg || error |
109 | open_samizdat_blockdev "$dev"3 /plaintext/disk.key || error | 112 | open_samizdat_blockdev "$dev"3 /plaintext/disk.key || error |
110 | open_samizdat || error | 113 | open_samizdat || error open_samizdat |
111 | bootdone root-mounted | 114 | bootdone root-mounted |
112 | ;; | 115 | ;; |
113 | boot-overwrite|boot-new|boot-luks) | 116 | boot-overwrite|boot-new|boot-luks) |
@@ -129,7 +132,7 @@ case "$1" in | |||
129 | 132 | ||
130 | if [ "$1" = 'boot-luks' ]; then | 133 | if [ "$1" = 'boot-luks' ]; then |
131 | open_samizdat_blockdev_from_loop "$loopfile" "$loopfile"k || error | 134 | open_samizdat_blockdev_from_loop "$loopfile" "$loopfile"k || error |
132 | open_samizdat || error | 135 | open_samizdat || error open_samizdat |
133 | bootdone root-mounted | 136 | bootdone root-mounted |
134 | exit | 137 | exit |
135 | fi | 138 | fi |