summaryrefslogtreecommitdiff
path: root/scripts/image_signing/set_channel.sh
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2019-03-13 17:02:40 -0400
committerMike Frysinger <vapier@chromium.org>2019-03-13 21:30:42 +0000
commit58c626a47675f1c8b2d85c3cc93b0b8473b9d683 (patch)
tree31d0e12766291ee925240853dd558d1de4cf0990 /scripts/image_signing/set_channel.sh
parent304aa429c1a04cda3ab2ce37b9e31af84405bfca (diff)
downloadvboot-58c626a47675f1c8b2d85c3cc93b0b8473b9d683.tar.gz
image_signing: switch to loopdevs directly
Newer kernels seem to be buggy when using loop mounts with offsets. Switch to using `losetup -P` everywhere as that doesn't seem to run into the bug. BUG=chromium:938958 TEST=precq passes & signing unittests pass BRANCH=None Change-Id: I3c35436708d0a4b2c5c1900406503e753f88a53c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1521065 Tested-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: LaMont Jones <lamontjones@chromium.org>
Diffstat (limited to 'scripts/image_signing/set_channel.sh')
-rwxr-xr-xscripts/image_signing/set_channel.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/image_signing/set_channel.sh b/scripts/image_signing/set_channel.sh
index a3bd4f97..0ab4ef16 100755
--- a/scripts/image_signing/set_channel.sh
+++ b/scripts/image_signing/set_channel.sh
@@ -24,11 +24,12 @@ fi
main() {
local image=$1
local to=$2
- local rootfs lsb
+ local loopdev rootfs lsb
+ loopdev=$(loopback_partscan "${image}")
rootfs=$(make_temp_dir)
lsb="${rootfs}/etc/lsb-release"
- mount_image_partition "${image}" 3 "${rootfs}"
+ mount_loop_image_partition "${loopdev}" 3 "${rootfs}"
# Get the current channel on the image.
local from=$(lsbval "${lsb}" 'CHROMEOS_RELEASE_TRACK')
from=${from%"-channel"}