summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Norris <briannorris@chromium.org>2020-10-27 15:57:29 -0700
committerLaMont Jones <lamontjones@chromium.org>2020-10-28 20:06:14 +0000
commit3c644e07368c8827c1de1c8d919c48dac1153c6a (patch)
treefd29b87dcf3c28811055d29c73c5f44a36f4f9cf
parent191d52fb9f64b749ca0577d454da679e58ad5a36 (diff)
downloadvboot-stabilize-rust-13562.B.tar.gz
sign_official_build: dump more info in resign_android_image_if_existsstabilize-rust-13562.B
We're getting silent errors in here somewhere. BRANCH=none BUG=chromium:1141907 TEST=none Change-Id: I9af0a3ea1696920fe67c915660f82a68c1bddf34 Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2504358 Reviewed-by: LaMont Jones <lamontjones@chromium.org> Commit-Queue: LaMont Jones <lamontjones@chromium.org> Tested-by: LaMont Jones <lamontjones@chromium.org>
-rwxr-xr-xscripts/image_signing/sign_official_build.sh11
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/image_signing/sign_official_build.sh b/scripts/image_signing/sign_official_build.sh
index 53c6a041..9a1a405a 100755
--- a/scripts/image_signing/sign_official_build.sh
+++ b/scripts/image_signing/sign_official_build.sh
@@ -740,10 +740,19 @@ resign_android_image_if_exists() {
fi
info "Found ARC image version '${arc_version}', re-signing APKs."
+ # TODO(crbug.com/1141907): remove set -x and set +x below.
+ set -x
"${SCRIPT_DIR}/sign_android_image.sh" "${rootfs_dir}" "${KEY_DIR}/android"
- sudo umount "${rootfs_dir}"
+ if ! sudo umount "${rootfs_dir}"; then
+ error "umount ${rootfs_dir} failed"
+ sudo lsof -n "${rootfs_dir}"
+ ps auxf
+ set +x
+ return 1
+ fi
info "Re-signed Android image"
+ set +x
}
# Sign UEFI binaries, if possible.