commit 62cde8832bc4b9e48c3a583abb28ef34928c4b5a
author Steven 'Steve' Kendall <skendall@neverware.com> Fri Jun 10 16:52:11 2016 -0400
committer chrome-bot <chrome-bot@chromium.org> Sat Jun 11 02:46:47 2016 -0700
tree 1710864a2fa903e6c53a5e0dc89971402bc49926
parent 019f38fde13a007d31cc6a35170e1482a7283719

Use constants for partition numbers in create_legacy_bootloader_templates.sh

BUG=None
TEST=built and booted an image, ensured mounts were recognized

Change-Id: I321fa4992a17828b0cd3789a002dc2c6dfc29da8
Reviewed-on: https://chromium-review.googlesource.com/351301
Commit-Ready: Steven 'Steve' Kendall <skendall@neverware.com>
Tested-by: Steven 'Steve' Kendall <skendall@neverware.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

build_library/create_legacy_bootloader_templates.sh

diff --git a/build_library/create_legacy_bootloader_templates.sh b/build_library/create_legacy_bootloader_templates.sh
index d81c05b..c64f888 100755
--- a/build_library/create_legacy_bootloader_templates.sh
+++ b/build_library/create_legacy_bootloader_templates.sh
@@ -9,6 +9,7 @@
 
 SCRIPT_ROOT=$(readlink -f $(dirname "$0")/..)
 . "${SCRIPT_ROOT}/common.sh" || exit 1
+. ${BUILD_LIBRARY_DIR}/disk_layout_util.sh
 
 # We're invoked only by build_image, which runs in the chroot
 assert_inside_chroot
@@ -213,8 +214,8 @@
   cat <<EOF | sudo dd of="${FLAGS_to}/efi/boot/grub.cfg" 2>/dev/null
 defaultA=0
 defaultB=1
-gptpriority \$grubdisk 2 prioA
-gptpriority \$grubdisk 4 prioB
+gptpriority \$grubdisk ${PARTITION_NUM_KERN_A} prioA
+gptpriority \$grubdisk ${PARTITION_NUM_KERN_B} prioB
 
 if [ \$prioA -lt \$prioB ]; then
   set default=\$defaultB
@@ -248,7 +249,7 @@
 
 # FIXME: usb doesn't support verified boot for now
 menuentry "Alternate USB Boot" {
-  linux (hd0,3)/boot/vmlinuz ${common_args} root=HDROOTUSB i915.modeset=1 cros_efi
+  linux (hd0,${PARTITION_NUM_ROOT_A})/boot/vmlinuz ${common_args} root=HDROOTUSB i915.modeset=1 cros_efi
 }
 EOF
   if [[ ${FLAGS_enable_rootfs_verification} -eq ${FLAGS_TRUE} ]]; then