summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2017-09-23 05:36:14 -0400
committerchrome-bot <chrome-bot@chromium.org>2017-09-26 13:36:17 -0700
commita2ccb41cbc875500fedc1cbe57a184e8461e31ad (patch)
treebd3784508961f7b97f5ee03d74afbf50ac1e90a8
parentb613faf5cd4359db719e7349148a94af4c50e342 (diff)
downloadvboot-a2ccb41cbc875500fedc1cbe57a184e8461e31ad.tar.gz
image_signing: allow input rootfs to be a directory
This allows for quick local testing by creating a dummy rootfs. BUG=chromium:714598 TEST=signing images still works BRANCH=None Change-Id: If252b119fd64686b46e9989d55bedbd1eec45700 Reviewed-on: https://chromium-review.googlesource.com/680039 Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: David Riley <davidriley@chromium.org>
-rwxr-xr-xscripts/image_signing/ensure_sane_lsb-release.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/image_signing/ensure_sane_lsb-release.sh b/scripts/image_signing/ensure_sane_lsb-release.sh
index 4d958b34..007ded0f 100755
--- a/scripts/image_signing/ensure_sane_lsb-release.sh
+++ b/scripts/image_signing/ensure_sane_lsb-release.sh
@@ -123,8 +123,15 @@ main() {
info "Loading config from ${configfile}"
. "$configfile" || return 1
- local rootfs=$(make_temp_dir)
- mount_image_partition_ro "$image" 3 "$rootfs"
+ local rootfs
+ if [[ -d "${image}" ]]; then
+ # We're given a mounted rootfs.
+ rootfs="${image}"
+ else
+ # Mount the disk image.
+ rootfs=$(make_temp_dir)
+ mount_image_partition_ro "$image" 3 "$rootfs"
+ fi
local lsb="$rootfs/$LSB_FILE"
# Basic syntax check first.