From dadb53ee4c27c3a4423765e0998c7a175d2b0822 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 28 May 2021 04:11:09 -0400 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2923828 Reviewed-by: George Engelbrecht --- scripts/image_signing/ensure_secure_kernelparams.sh | 3 +-- 1 file changed, 1 insertion(+), 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}") -- cgit v1.2.1