From 95026958c1230264c0487e43bf7f5dbb16add148 Mon Sep 17 00:00:00 2001 From: Mandeep Singh Baines Date: Wed, 20 Apr 2011 16:28:54 -0700 Subject: [PATCH] cros_make_image_bootable: default to verity_depth=0 Verity only supports a depth of 0. Passing anything other than 0 will cause a verity failure. BUG=14314 TEST=Verified that verity does not fail when do depth is passed. Before this change, verity would fail with the error message reported in the bug. Change-Id: I68495c4486284744ee0779b6c9cdc0ef214519c7 R=gauravsh@google.com,scottz@google.com,drewry@google.com Review URL: http://codereview.chromium.org/6873134 --- bin/cros_make_image_bootable | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/cros_make_image_bootable b/bin/cros_make_image_bootable index e9d3080f0d..5f28d620f1 100755 --- a/bin/cros_make_image_bootable +++ b/bin/cros_make_image_bootable @@ -97,7 +97,8 @@ DEFINE_boolean enable_rootfs_verification ${FLAGS_FALSE} \ "Default all bootloaders to use kernel-based root fs integrity checking." DEFINE_integer verity_error_behavior 2 \ "Kernel verified boot error behavior (0: I/O errors, 1: reboot, 2: nothing)" -DEFINE_integer verity_depth 1 \ +# TODO(msb) remove this option (http://crosbug.com/14357) +DEFINE_integer verity_depth 0 \ "Kernel verified boot hash tree depth" DEFINE_integer verity_max_ios 1024 \ "Number of outstanding I/O operations dm-verity caps at."