From 4f0a7f6ef108221feb2504f275a4bfb663496997 Mon Sep 17 00:00:00 2001 From: Will Drewry Date: Fri, 23 Jul 2010 12:33:57 -0500 Subject: [PATCH] create_legacy_bootloader_templates: re-enable chromeos-vusb with --enable-rootfs_verification This change can land once the kernel support for dm device waiting and the chromeos-installer changes land and their ebuilds are rev'd. TEST=build_image --enable_rootfs_verification; booted to a verified image! BUG=chromium-os:2963 Change-Id: Ia68f90a59ab1360da01d5f422c16178af16cbaeb Review URL: http://codereview.chromium.org/3013028 --- create_legacy_bootloader_templates.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/create_legacy_bootloader_templates.sh b/create_legacy_bootloader_templates.sh index 36adbb7670..9cfd48f8fd 100755 --- a/create_legacy_bootloader_templates.sh +++ b/create_legacy_bootloader_templates.sh @@ -99,13 +99,16 @@ EOF info "Emitted ${SYSLINUX_DIR}/syslinux.cfg" if [[ ${FLAGS_enable_rootfs_verification} -eq ${FLAGS_TRUE} ]]; then - # TODO(wad, tgao) enable usb vbooting with initramfs or device probing. - warn "USB booting will not use rootfs verification." - fi - # To change the active target, only this file needs to change. - cat </dev/null + # To change the active target, only this file needs to change. + cat </dev/null +DEFAULT chromeos-vusb.A +EOF + else + # To change the active target, only this file needs to change. + cat </dev/null DEFAULT chromeos-usb.A EOF + fi info "Emitted ${SYSLINUX_DIR}/default.cfg" cat </dev/null