summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2019-11-13 15:33:15 -0800
committerCommit Bot <commit-bot@chromium.org>2019-11-20 07:00:31 +0000
commit51e0da5923dffadd7e22fb325656138a7004e5a7 (patch)
treeddd837b3ad35f2bd3eb260da012c39bc8a76269d
parent045d8afe4e7acfa96729e0ca765b454077761043 (diff)
downloadvboot-51e0da5923dffadd7e22fb325656138a7004e5a7.tar.gz
chromeos-tpm-recovery: Clarify error message for boot mode
chromeos-tpm-recovery only works when it's actually booted in recovery mode, not when just running a recovery image in developer mode with Ctrl+U. This distinction is often not super clear to non-firmware people, so make the error message more explicit. BRANCH=None BUG=None TEST=None Change-Id: I18afa933f624f26d1f7949b9b586ab01daf7c801 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1913491 Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Joel Kitching <kitching@chromium.org> (cherry picked from commit 32b5c34d13334b4fe7924a48cdf97b1f8daab635) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1924300 Reviewed-by: Shelley Chen <shchen@chromium.org> Commit-Queue: Shelley Chen <shchen@chromium.org> Tested-by: Shelley Chen <shchen@chromium.org>
-rwxr-xr-xutility/chromeos-tpm-recovery2
1 files changed, 1 insertions, 1 deletions
diff --git a/utility/chromeos-tpm-recovery b/utility/chromeos-tpm-recovery
index bcb1819f..e2b0a8de 100755
--- a/utility/chromeos-tpm-recovery
+++ b/utility/chromeos-tpm-recovery
@@ -106,7 +106,7 @@ fi
# Did the firmware keep the TPM unlocked?
if ! $($crossystem mainfw_type?recovery); then
- quit "You must put a test image on a USB stick and boot it in recovery mode to run this"
+ quit "You must put a test image on a USB stick and boot it in recovery mode (this means Esc+Refresh+Power, *not* Ctrl-U!) to run this"
fi
if tpm2_target; then