diff options
| author | LaMont Jones <lamontjones@chromium.org> | 2019-05-15 10:07:40 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-21 14:20:35 -0700 |
| commit | b3c40c0f3781aa10829636e5bc314a3e489bfa98 (patch) | |
| tree | 9f3edfe56c2f3102f77eb46f4a21f956d62dcb0d | |
| parent | 39b755ea1477d183c5eaa14947cb0ebb8373d8e4 (diff) | |
| download | vboot-b3c40c0f3781aa10829636e5bc314a3e489bfa98.tar.gz | |
sign_official_build.sh: consistent format loem.ini
sign_official_build.sh accepted a subset of the syntax allowed by
sign_firmware.sh. Update to be consistent.
BUG=chromium:962529
BRANCH=None
TEST=Manually verified
Change-Id: Ic9c7d5d8a4744c09c06249ed835ef678e6368aa0
Reviewed-on: https://chromium-review.googlesource.com/1612376
Commit-Ready: LaMont Jones <lamontjones@chromium.org>
Tested-by: LaMont Jones <lamontjones@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Jason Clinton <jclinton@chromium.org>
| -rwxr-xr-x | scripts/image_signing/sign_official_build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/image_signing/sign_official_build.sh b/scripts/image_signing/sign_official_build.sh index a5f3f867..ac0abca3 100755 --- a/scripts/image_signing/sign_official_build.sh +++ b/scripts/image_signing/sign_official_build.sh @@ -555,8 +555,8 @@ resign_firmware_payload() { # This is what updater4.sh currently uses to make the decision. if [[ -e "${KEY_DIR}/loem.ini" ]]; then # loem.ini has the format KEY_ID_VALUE = KEY_INDEX - local match="$(grep -E "[0-9]+ = ${key_id}$" "${KEY_DIR}/loem.ini")" - local key_index="$(echo "${match}" | cut -d ' ' -f 1)" + local match="$(grep -E "[0-9]+ *= *${key_id}$" "${KEY_DIR}/loem.ini")" + local key_index="$(echo "${match}" | sed 's/ *= *.*$//g')" info "Detected key index from loem.ini as ${key_index} for ${key_id}" if [[ -z "${key_index}" ]]; then die "Failed to find key_id ${key_id} in loem.ini file for " \ |