From a84e93a688e6a79b81b459ee2d899437c4da0fac Mon Sep 17 00:00:00 2001 From: Shawn Nematbakhsh Date: Thu, 25 Oct 2012 13:59:25 -0700 Subject: [PATCH] Fix factory install shim w/ legacy x86 boot. Install shim images are broken when booting from legacy x86 BIOS. The install shim relies upon "cros_factory_install" being passed as a boot flag. This flag is never passed to create_legacy_bootloader_templates, so the install shim flow is broken. This change passes the boot args flags to create_legacy_bootloader... so the install shim will function normally. TEST=Create factory_install image, verify correct boot w/ x86 BIOS. BUG=chrome-os-partner:15661 Change-Id: I46b2be188f48b7626bfd3235d5788410c7488c42 Reviewed-on: https://gerrit.chromium.org/gerrit/36590 Tested-by: Shawn Nematbakhsh Reviewed-by: Hung-Te Lin Reviewed-by: Liam McLoughlin Commit-Ready: Shawn Nematbakhsh --- build_library/base_image_util.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh index 7039c6af4f..7cf748f4c9 100755 --- a/build_library/base_image_util.sh +++ b/build_library/base_image_util.sh @@ -220,6 +220,7 @@ create_base_image() { ${BUILD_LIBRARY_DIR}/create_legacy_bootloader_templates.sh \ --arch=${ARCH} \ --to="${root_fs_dir}"/boot \ + --boot_args="${FLAGS_boot_args}" \ ${enable_rootfs_verification} # Don't test the factory install shim