kernel cmdline: add dm_verity.dev_wait=1

build_kernel_image.sh

Index: build_kernel_image.sh
diff --git a/build_kernel_image.sh b/build_kernel_image.sh
index df40db9231ee11142e621b0fd7cacf08c75d25f9..ce94f1dcf32740a4c616ad2dca6e667d82bb2aec 100755
--- a/build_kernel_image.sh
+++ b/build_kernel_image.sh
@@ -101,10 +101,18 @@ if [[ -n "${FLAGS_rootfs_image}" && -n "${FLAGS_rootfs_hash}" ]]; then
 fi
 
 mkdir -p "${FLAGS_working_dir}"
+
+# Only let dm-verity block if rootfs verification is configured.
+dev_wait=0
+if [[ ${FLAGS_root} = "/dev/dm-0" ]]; then
+  dev_wait=1
+fi
+
 cat <<EOF > "${FLAGS_working_dir}/boot.config"
 root=${FLAGS_root}
 dm_verity.error_behavior=${FLAGS_verity_error_behavior}
 dm_verity.max_bios=${FLAGS_verity_max_ios}
+dm_verity.dev_wait=${dev_wait}
 ${verity_args}
 ${FLAGS_boot_args}
 EOF