summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward O'Callaghan <quasisec@google.com>2023-02-08 15:26:47 +1100
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-02-24 09:11:05 +0000
commite95815646eef6d58fe197f2f8ec95a69905e4b3e (patch)
treecbf18d47e1d5d109549bf231527ae8c1e0854264
parent529821b48d272d2d8ad47cb04f63afb5e57c8207 (diff)
downloadvboot-stabilize-15364.B.tar.gz
scripts/image_signing/make_dev_ssd.sh: Replace flashrom callstabilize-15364.B
Just use futility directly. BUG=b:260531154 TEST=``` localhost ~ # futility gbb -g --flash --rootkey=/tmp/rkey >/dev/null 2>&1 localhost ~ # od /tmp/rkey | head -130 | md5sum | sed 's/ .*$//' a13642246ef93daaf75bd791446fec9b ``` Change-Id: I1aa3b52f568a5e78255b52a15d68258cc9d9aa44 Signed-off-by: Edward O'Callaghan <quasisec@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4269750 Reviewed-by: Yu-Ping Wu <yupingso@chromium.org> Commit-Queue: Yu-Ping Wu <yupingso@chromium.org> Tested-by: Edward O'Callaghan <quasisec@chromium.org> Reviewed-by: Sam McNally <sammc@chromium.org> Auto-Submit: Edward O'Callaghan <quasisec@chromium.org>
-rwxr-xr-xscripts/image_signing/make_dev_ssd.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/image_signing/make_dev_ssd.sh b/scripts/image_signing/make_dev_ssd.sh
index a2db3229..09ad8d75 100755
--- a/scripts/image_signing/make_dev_ssd.sh
+++ b/scripts/image_signing/make_dev_ssd.sh
@@ -447,11 +447,9 @@ validity_check_live_firmware() {
return
fi
debug_msg "Loading firmware to check root key..."
- local bios_image="$(make_temp_file)"
local rootkey_file="$(make_temp_file)"
info "checking system firmware..."
- sudo flashrom -p host -i GBB -r "$bios_image" >/dev/null 2>&1
- futility gbb -g --rootkey="$rootkey_file" "$bios_image" >/dev/null 2>&1
+ futility gbb -g --flash --rootkey="$rootkey_file" >/dev/null 2>&1
if [ ! -s "$rootkey_file" ]; then
debug_msg "failed to read root key from system firmware..."
else