From 23fe17a20e328b86dc114fcb1f2f48322c2c8ca6 Mon Sep 17 00:00:00 2001 From: Hung-Te Lin Date: Thu, 13 Oct 2011 19:29:17 +0800 Subject: [PATCH] crosutils: fix factory install shim when booting with legacy EFI firmware Verified boot is not supported yet for USB+EFI boot, which is the case of factory install shim. We need to select normal boot in legacy boot loaders when building factory install shim. BUG=chrome-os-partner:6358 TEST=build_image --factory_install # boots successfully under ZGB H2O firmware Change-Id: Ic4645a1766514bf7e0c31f8a4df21452bf195705 Reviewed-on: http://gerrit.chromium.org/gerrit/10013 Tested-by: Hung-Te Lin Reviewed-by: Richard Barnette Reviewed-by: Nick Sanders --- build_library/base_image_util.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh index e1d13df186..267cb8f79c 100755 --- a/build_library/base_image_util.sh +++ b/build_library/base_image_util.sh @@ -202,8 +202,12 @@ ${BOARD} to update the version of libc installed on that board." # use those templates to update the legacy boot partition (12/ESP) # on update. # (This script does not populate vmlinuz.A and .B needed by syslinux.) + # Factory install shims may be booted from USB by legacy EFI BIOS, which does + # not support verified boot yet (see create_legacy_bootloader_templates.sh) + # so rootfs verification is disabled if we are building with --factory_install local enable_rootfs_verification= - if [[ ${FLAGS_enable_rootfs_verification} -eq ${FLAGS_TRUE} ]]; then + if [[ ${FLAGS_enable_rootfs_verification} -eq ${FLAGS_TRUE} ]] && + [[ ${FLAGS_factory_install} -eq ${FLAGS_FALSE} ]] ; then enable_rootfs_verification="--enable_rootfs_verification" fi