diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2014-07-10 17:52:10 +0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-08-25 04:53:36 +0000 |
| commit | 8f15d74fd64e4a4d98471221948cc8f1fde127e2 (patch) | |
| tree | cb4d521e6c0ba10569eed784c1473fcbaca242c0 | |
| parent | e5b7a541190c3af1607e14548148f5e336e7ce84 (diff) | |
| download | vboot-8f15d74fd64e4a4d98471221948cc8f1fde127e2.tar.gz | |
make_dev_ssd: Allow chromeos-install to run on a modified image.
chromeos-install always expects DM verity information from install source,
because even when --noenable_rootfs_verification is applied, the output image
will still include DM verity in kernel command line (just not enabled).
To support developers installing a modified image (by
--remove_rootfs_verification), we have to change the command line to keep DM
verity data, just like how --noenable_rootfs_verification is done.
BRANCH=none
BUG=none
TEST=make_dev_ssd.sh --noenable_rootfs_verification; reboot;
chromeos-install # success.
Change-Id: I3b2c8cbf1b89086ed91b5549c7147cd940fbda14
Reviewed-on: https://chromium-review.googlesource.com/207321
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>
| -rwxr-xr-x | scripts/image_signing/make_dev_ssd.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/image_signing/make_dev_ssd.sh b/scripts/image_signing/make_dev_ssd.sh index be9eddbe..90fbb64a 100755 --- a/scripts/image_signing/make_dev_ssd.sh +++ b/scripts/image_signing/make_dev_ssd.sh @@ -62,9 +62,10 @@ EXEC_LOG="$(make_temp_file)" remove_rootfs_verification() { local new_root="PARTUUID=%U/PARTNROFF=1" echo "$*" | sed ' - s| root=/dev/dm-[0-9] | root='"$new_root"' | - s| dm_verity[^=]*=[-0-9]*||g - s| dm="[^"]*"|| + s| root=/dev/dm-0 | root='"$new_root"' | + s| dm_verity.dev_wait=1 | dm_verity.dev_wait=0 | + s| payload=PARTUUID=%U/PARTNROFF=1 | payload=ROOT_DEV | + s| hashtree=PARTUUID=%U/PARTNROFF=1 | hashtree=HASH_DEV | s| ro | rw |' } |