From 51e0da5923dffadd7e22fb325656138a7004e5a7 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Wed, 13 Nov 2019 15:33:15 -0800 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1913491 Reviewed-by: Curtis Malainey Reviewed-by: Joel Kitching (cherry picked from commit 32b5c34d13334b4fe7924a48cdf97b1f8daab635) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1924300 Reviewed-by: Shelley Chen Commit-Queue: Shelley Chen Tested-by: Shelley Chen --- utility/chromeos-tpm-recovery | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1