From a1001da56512fdcd3bd648a5a04da03ffea3e91b Mon Sep 17 00:00:00 2001 From: Qiang Xu Date: Fri, 7 Oct 2016 10:55:39 -0700 Subject: Strip out bootcache config when removing rootfs verification For a device with bootcache support (such as parrot), the kernel config contains bootcache args (reference: device_map_args in build_kernel_image.sh). When removing rootfs verification, bootcache should be disabled, equivalently we should remove bootcache args. BRANCH=vboot_reference BUG=chromium:590606 TEST=tested on parrot device with ./build_image --board=parrot test. After installing the image on device, (1) run sudo /usr/share/vboot/bin/make_dev_ssd.sh --remove_rootfs_verification (2) reboot The bootloop bug is fixed. Change-Id: I56ca5f2d98e00e1117611959a67ce72338ec7377 Reviewed-on: https://chromium-review.googlesource.com/395386 Commit-Ready: Qiang Xu Tested-by: Qiang Xu Reviewed-by: Hung-Te Lin Reviewed-by: Qiang Xu Reviewed-by: Mike Frysinger --- scripts/image_signing/make_dev_ssd.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/image_signing/make_dev_ssd.sh b/scripts/image_signing/make_dev_ssd.sh index 28d42a69..db076cc3 100755 --- a/scripts/image_signing/make_dev_ssd.sh +++ b/scripts/image_signing/make_dev_ssd.sh @@ -61,9 +61,12 @@ EXEC_LOG="$(make_temp_file)" # ---------------------------------------------------------------------------- # Removes rootfs verification from kernel boot parameter +# And strip out bootcache args if it exists remove_rootfs_verification() { local new_root="PARTUUID=%U/PARTNROFF=1" + # the first line in sed is to strip out bootcache details echo "$*" | sed ' + s| dm=\"2 [^"]*bootcache[^"]* vroot | dm=\"1 vroot | s| root=/dev/dm-[0-9] | root='"$new_root"' | s| dm_verity.dev_wait=1 | dm_verity.dev_wait=0 | s| payload=PARTUUID=%U/PARTNROFF=1 | payload=ROOT_DEV | -- cgit v1.2.1