summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2021-05-28 04:11:09 -0400
committerCommit Bot <commit-bot@chromium.org>2021-06-05 20:14:11 +0000
commitdadb53ee4c27c3a4423765e0998c7a175d2b0822 (patch)
treeba32ca5c3354b133fd74508ad5431abb58f17966
parente1b08d4312a514b2d29ae0db51a699c1a1d96fba (diff)
downloadvboot-dadb53ee4c27c3a4423765e0998c7a175d2b0822.tar.gz
image_signing: fix rootfs mount when checking kernel params
Use the existing mount helper so we clean up automatically when exiting. BUG=None TEST=CQ passes BRANCH=None Change-Id: I882c7f5ea3b54e08745c48378cc50702550cdc71 Signed-off-by: Mike Frysinger <vapier@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2923828 Reviewed-by: George Engelbrecht <engeg@google.com>
-rwxr-xr-xscripts/image_signing/ensure_secure_kernelparams.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/image_signing/ensure_secure_kernelparams.sh b/scripts/image_signing/ensure_secure_kernelparams.sh
index 12bfbe5d..b971ab4e 100755
--- a/scripts/image_signing/ensure_secure_kernelparams.sh
+++ b/scripts/image_signing/ensure_secure_kernelparams.sh
@@ -100,9 +100,8 @@ main() {
# which is the install kernel on the recovery image.
# crosbug.com/24274
local loop_kern="${loopdev}p4"
- local loop_rootfs="${loopdev}p3"
local rootfs=$(make_temp_dir)
- sudo mount -o ro "${loop_rootfs}" "${rootfs}"
+ mount_loop_image_partition_ro "${loopdev}" 3 "${rootfs}"
# Pick the right set of test-expectation data to use.
local boardvar=$(get_boardvar_from_lsb_release "${rootfs}")