diff options
| author | Mike Frysinger <vapier@chromium.org> | 2017-05-15 16:40:20 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@chromium.org> | 2017-05-16 17:43:14 +0000 |
| commit | b660356d515473a81e424410ead2cdf566159406 (patch) | |
| tree | 6101255f6b16162f343d4caf7f6a1b570b16c383 | |
| parent | 36e030df800f8df7913a3629ea0ab8636dc789e5 (diff) | |
| download | vboot-b660356d515473a81e424410ead2cdf566159406.tar.gz | |
image_signing: fix key insert logic
We don't want to override the common trap as the common sh files already
have handlers installed to clean up files/mounts. Re-use those helpers
to avoid leaking loopback mounts.
BRANCH=None
BUG=chromium:718184
TEST=signing images still works
Change-Id: I749ce5075194356219fea51152154fdc5a2e3b99
Reviewed-on: https://chromium-review.googlesource.com/505575
Reviewed-by: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
| -rwxr-xr-x | scripts/image_signing/insert_container_publickey.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/image_signing/insert_container_publickey.sh b/scripts/image_signing/insert_container_publickey.sh index 8cd60e4a..0b9348e8 100755 --- a/scripts/image_signing/insert_container_publickey.sh +++ b/scripts/image_signing/insert_container_publickey.sh @@ -40,8 +40,7 @@ main() { fi # Imageloader likes DER as a runtime format as it's easier to read. - local tmpfile=$(mktemp) - trap "rm -f '${tmpfile}'" EXIT + local tmpfile=$(make_temp_file) openssl pkey -pubin -in "${pub_key}" -out "${tmpfile}" -pubout -outform DER sudo install \ |