summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Moragues <moragues@google.com>2020-08-17 21:51:36 +0000
committerCommit Bot <commit-bot@chromium.org>2020-08-18 09:42:23 +0000
commit075ce5e15eca906b937d5a2b4a8245bbbadcc272 (patch)
treeac32427f988f66840bdc5cb1a86ce90d50206176
parent4f2fc7ae50e01b45a5e88982084e3974a232b028 (diff)
downloadvboot-075ce5e15eca906b937d5a2b4a8245bbbadcc272.tar.gz
futility: Allow --force to override min_platform_version quirk
BUG=b:162747154 BRANCH=none TEST=verify that update runs for rev1, but not rev0 without --force TEST=verify that update runs for both rev1 and rev0 with --force Signed-off-by: Bob Moragues <moragues@chromium.org> Change-Id: I1594d6a4c83d8a0c13494f8f108225618612db8e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2360590 Reviewed-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> Commit-Queue: Hung-Te Lin <hungte@chromium.org>
-rw-r--r--futility/updater.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/futility/updater.c b/futility/updater.c
index 10efd632..a8dfb8d8 100644
--- a/futility/updater.c
+++ b/futility/updater.c
@@ -1173,9 +1173,12 @@ enum updater_error_codes update_firmware(struct updater_config *cfg)
image_to->file_name, image_to->ro_version,
image_to->rw_version_a, image_to->rw_version_b);
- if (try_apply_quirk(QUIRK_MIN_PLATFORM_VERSION, cfg))
- return UPDATE_ERR_PLATFORM;
-
+ if (try_apply_quirk(QUIRK_MIN_PLATFORM_VERSION, cfg)) {
+ if (!cfg->force_update) {
+ ERROR("Add --force to waive checking the version.\n");
+ return UPDATE_ERR_PLATFORM;
+ }
+ }
if (!image_from->data) {
int ret;
INFO("Loading current system firmware...\n");