commit 85a14c58a99b96bf297b6d0e39a4c4ef7a70a9a4
author Oleksandr Tymoshenko <ovt@google.com> Tue Mar 02 01:34:49 2021 +0000
committer Oleksandr Tymoshenko <ovt@google.com> Tue Mar 02 04:21:46 2021 +0000
tree dbe349c9e8b47519d70ba5844ef9036ba8ae8b4c
parent 76f2486a685a8aa6244d3bd15b7b620de5e775cb

project-lakitu: fix boot on ARM64

Use correct function name, get_layout_partition_number,
which was changed to get_layout_part_number by a last-minute
search/replace operation.

Also add an error detection logic for this condition instead
of failing silently later on and generating corrupted image.

BUG=b/179918454
TEST=presubmit
RELEASE_NOTE=None

Change-Id: I9e549914a7fec51b1db877f7a3ac18cbb44bdf98
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/13470
Reviewed-by: Roy Yang <royyang@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>

project-lakitu/scripts/bootloader_install.sh

diff --git a/project-lakitu/scripts/bootloader_install.sh b/project-lakitu/scripts/bootloader_install.sh
index fbc4b2d..d517fd5 100755
--- a/project-lakitu/scripts/bootloader_install.sh
+++ b/project-lakitu/scripts/bootloader_install.sh
@@ -265,17 +265,23 @@
   verity_common="${verity_common} dm_verity.dev_wait=${dev_wait}"
 
   # Discover last known partition numbers.
-  part_num_kern_a="$(get_layout_part_number \
+  part_num_kern_a="$(get_layout_partition_number \
       "${FLAGS_image_type}" KERN-A)"
-  part_num_kern_b="$(get_layout_part_number \
+  part_num_kern_b="$(get_layout_partition_number \
       "${FLAGS_image_type}" KERN-B)"
-  part_num_root_a="$(get_layout_part_number \
+  part_num_root_a="$(get_layout_partition_number \
       "${FLAGS_image_type}" ROOT-A)"
-  part_num_root_b="$(get_layout_part_number \
+  part_num_root_b="$(get_layout_partition_number \
       "${FLAGS_image_type}" ROOT-B)"
   root_a_uuid="PARTUUID=$(part_index_to_uuid "${LOOP_DEV}" ${part_num_root_a})"
   root_b_uuid="PARTUUID=$(part_index_to_uuid "${LOOP_DEV}" ${part_num_root_b})"
 
+  # Make sure we got the kernel partition
+  if [ -z "${part_num_kern_a}" ]; then
+      error "failed to get a partition number for KERN-A"
+      return 1
+  fi
+
   dm_table=
   # get cmdline from any kernel partition
   kernel_cmdline=$(sudo dump_kernel_config "${LOOP_DEV}p${part_num_kern_a}")