build_kernel_image.sh - Issue 6901005: src/scripts: remove all references to verity_depth

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build_kernel_image.sh

Issue 6901005: src/scripts: remove all references to verity_depth (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master

Patch Set: Add comments. Created 9 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build_kernel_image.sh

diff --git a/build_kernel_image.sh b/build_kernel_image.sh

index 34fb977fb1ab89b499fdd4094e948df448a826d8..736d72a8b6c76d6da05662b2b310e9a0176d20b0 100755

--- a/build_kernel_image.sh

+++ b/build_kernel_image.sh

@@ -64,8 +64,6 @@ DEFINE_string rootfs_hash "" \

DEFINE_integer verity_error_behavior 2 \

"Verified boot error behavior [0: I/O errors, 1: reboot, 2: nothing] \

(Default: 2)"

-DEFINE_integer verity_tree_depth 0 \

- "Optional Verified boot hash tree depth. (Default: 0)"

DEFINE_integer verity_max_ios -1 \

"Optional number of outstanding I/O operations. (Default: -1)"

DEFINE_string verity_hash_alg "sha1" \

@@ -101,7 +99,8 @@ if [[ -n "${FLAGS_rootfs_image}" && -n "${FLAGS_rootfs_hash}" ]]; then

info "Generating root fs hash tree."

# Runs as sudo in case the image is a block device.

- table=$(sudo verity create ${FLAGS_verity_tree_depth} \

+ # First argument to verity is reserved/unused and MUST be 0

+ table=$(sudo verity create 0 \

${FLAGS_verity_hash_alg} \

${FLAGS_rootfs_image} \

${root_fs_blocks} \

« no previous file with comments | « build_image ('k') | mod_image_for_recovery.sh » ('j') | no next file with comments »