commit 215b754ae1f45d876edd090ce86d444bf7b0d443
author Pin-Yen Lin <treapking@google.com> Tue May 05 09:45:37 2020 +0800
committer Commit Bot <commit-bot@chromium.org> Tue May 05 12:33:50 2020 +0000
tree ce1bf9d577e20e1449a237b8eba75fc774f4bcb3
parent 63326c8aa7150c6d3ceee2403bdd973f6112e22f

finalize: change is_chromebox to has_ec_pubkey

Change the variable name because with EFSv2, chromeboxes devices are
not neccesary to verify the EC public key. Thus change this name to
avoid confusement.

BUG=b:154569429
TEST=run finalize from goofy

Change-Id: Ib8faa09c9597915185b81cd37250b0825c8f4561
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/factory/+/2182097
Reviewed-by: Stimim Chen <stimim@chromium.org>
Commit-Queue: Pin-yen Lin <treapking@chromium.org>
Tested-by: Pin-yen Lin <treapking@chromium.org>

py/gooftool/commands.py

diff --git a/py/gooftool/commands.py b/py/gooftool/commands.py
index 856477f..162bf74 100755
--- a/py/gooftool/commands.py
+++ b/py/gooftool/commands.py
@@ -189,10 +189,9 @@
          'items. For example, registration codes or firmware bitmap '
          'locale settings).')
 
-_chromebox_cmd_arg = CmdArg(
-    '--chromebox', action='store_true', default=None,
-    help='Finalize for ChromeBox devices (may add or remove few test '
-    'items. For example, VerifyECKey).')
+_has_ec_pubkey_cmd_arg = CmdArg(
+    '--has_ec_pubkey', action='store_true', default=None,
+    help='The device has EC public key for EFS and need to run VerifyECKey.')
 
 _enforced_release_channels_cmd_arg = CmdArg(
     '--enforced_release_channels', nargs='*', default=None,
@@ -553,7 +552,7 @@
          _hwid_vpd_data_file_cmd_arg,
          _rma_mode_cmd_arg,
          _cros_core_cmd_arg,
-         _chromebox_cmd_arg,
+         _has_ec_pubkey_cmd_arg,
          _ec_pubkey_path_cmd_arg,
          _ec_pubkey_hash_cmd_arg,
          _release_rootfs_cmd_arg,
@@ -576,7 +575,7 @@
     VerifyManagementEngineLocked(options)
   VerifyHWID(options)
   VerifySystemTime(options)
-  if options.chromebox:
+  if options.has_ec_pubkey:
     VerifyECKey(options)
   VerifyKeys(options)
   VerifyRootFs(options)
@@ -794,7 +793,7 @@
          _hwid_vpd_data_file_cmd_arg,
          _rma_mode_cmd_arg,
          _cros_core_cmd_arg,
-         _chromebox_cmd_arg,
+         _has_ec_pubkey_cmd_arg,
          _ec_pubkey_path_cmd_arg,
          _ec_pubkey_hash_cmd_arg,
          _release_rootfs_cmd_arg,