Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Unified Diff: create_legacy_bootloader_templates.sh

Issue 3936001: kernel cmdline: add dm_verity.dev_wait=1 (Closed) Base URL: http://git.chromium.org/git/crosutils.git
Patch Set: fix use of non-existent flag Created 10 years, 2 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build_kernel_image.sh ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: create_legacy_bootloader_templates.sh
diff --git a/create_legacy_bootloader_templates.sh b/create_legacy_bootloader_templates.sh
index 2585fed2896e07000f004760c81fa7db57d235bc..955da4826dd8fd8b6cd152b1d00ad542e3c4a8fd 100755
--- a/create_legacy_bootloader_templates.sh
+++ b/create_legacy_bootloader_templates.sh
@@ -35,6 +35,12 @@ FLAGS "$@" || exit 1
eval set -- "${FLAGS_ARGV}"
set -e
+# Only let dm-verity block if rootfs verification is configured.
+dev_wait=0
+if [[ ${FLAGS_enable_rootfs_verification} -eq ${FLAGS_TRUE} ]]; then
+ dev_wait=1
+fi
+
# Common kernel command-line args
common_args="quiet console=tty2 init=/sbin/init boot=local rootwait ro noresume"
common_args="${common_args} noswap loglevel=1 ${FLAGS_boot_args}"
@@ -42,6 +48,9 @@ common_args="${common_args} noswap loglevel=1 ${FLAGS_boot_args}"
# Common verified boot command-line args
verity_common="dm_verity.error_behavior=${FLAGS_verity_error_behavior}"
verity_common="${verity_common} dm_verity.max_bios=${FLAGS_verity_max_ios}"
+# Ensure that dm-verity waits for its device.
+# TODO(wad) should add a timeout that display a useful message
+verity_common="${verity_common} dm_verity.dev_wait=${dev_wait}"
# Populate the x86 rootfs to support legacy and EFI bios config templates.
# The templates are used by the installer to populate partition 12 with
« no previous file with comments | « build_kernel_image.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698