cros_make_image_bootable: default to verity_depth=0

bin/cros_make_image_bootable

 #!/bin/bash
 #
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Script which ensures that a given image has an up-to-date
 # kernel partition, rootfs integrity hashes, and legacy bootloader configs.
 
 # --- BEGIN COMMON.SH BOILERPLATE ---
@@ skipping 79 matching lines @@
 # ceil(0.1 * rootfs_size) is a good minimum.
 DEFINE_integer rootfs_hash_pad 8 \
   "MBs reserved at the end of the rootfs image."
 
 DEFINE_string rootfs_hash "/tmp/rootfs.hash" \
   "Path where the rootfs hash should be stored."
 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)

[gauravsh, 2011/04/20 22:44:25]

nit: space between # and TODO

+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."
 DEFINE_string verity_algorithm "sha1" \
   "Cryptographic hash algorithm used for kernel vboot."
 
 DEFINE_string keys_dir "/usr/share/vboot/devkeys" \
   "Directory containing the signing keys."
 
 DEFINE_string rootfs_mountpoint "/tmp/rootfs" \
@@ skipping 200 matching lines @@
 mkdir -p ${FLAGS_espfs_mountpoint}
 
 make_image_bootable "${IMAGE}"
 verify_image_rootfs "${IMAGE}"
 
 if [ ${FLAGS_cleanup_dirs} -eq ${FLAGS_TRUE} ]; then
   rmdir ${FLAGS_rootfs_mountpoint}
   rmdir ${FLAGS_statefulfs_mountpoint}
   rmdir ${FLAGS_espfs_mountpoint}
 fi