commit dda79e2d9b306c408172d8aacb2ff3459e3bac6a
author Tudor Brindus <tbrindus@chromium.org> Thu Jun 28 18:03:21 2018 -0700
committer chrome-bot <chrome-bot@chromium.org> Mon Jul 09 17:59:25 2018 -0700
tree 7a94691ff0b0b8ddcea03f0394610140d0fa8a20
parent acd20391ab989971725a8b25ca9a08e1d5a7a3c8

delta_generator: Use "kernel" and "root" partition names internally

This commit abandons using "boot" and "system" names internally for
major version 1 payloads in favor of "kernel" and "root", which is
symmetrical with what's used in major version 2 payloads.

BUG=chromium:794404
TEST=no errors running brillo_update_payload with FORCE_MAJOR_VERSION
  set to either 1 or 2; paycheck.py <generated payload> --check and
  printing partition names in protobuf confirms correct names are
  generated

Change-Id: I396274812d5586e19a021c05b8b7a415aac976bf
Reviewed-on: https://chromium-review.googlesource.com/1119573
Commit-Ready: Tudor Brindus <tbrindus@chromium.org>
Tested-by: Tudor Brindus <tbrindus@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>

scripts/brillo_update_payload

diff --git a/scripts/brillo_update_payload b/scripts/brillo_update_payload
index 9dae42b..70ab7e2 100755
--- a/scripts/brillo_update_payload
+++ b/scripts/brillo_update_payload
@@ -118,7 +118,7 @@
 
 # Check that a command is specified.
 if [[ $# -lt 1 ]]; then
-  echo "Please specify a command [generate|hash|sign|properties]"
+  echo "Please specify a command [generate|hash|sign|properties|verify]"
   exit 1
 fi
 
@@ -362,18 +362,15 @@
   # updater supports a newer major version.
   FORCE_MAJOR_VERSION="1"
 
-  # When generating legacy Chrome OS images, we need to use "boot" and "system"
-  # for the partition names to be compatible with updating Brillo devices with
-  # Chrome OS images.
-  eval ${partitions_array}[boot]=\""${kernel}"\"
-  eval ${partitions_array}[system]=\""${root}"\"
+  eval ${partitions_array}[kernel]=\""${kernel}"\"
+  eval ${partitions_array}[root]=\""${root}"\"
 
   if [[ -n "${partitions_order}" ]]; then
-    eval "${partitions_order}=( \"system\" \"boot\" )"
+    eval "${partitions_order}=( \"root\" \"kernel\" )"
   fi
 
   local part varname
-  for part in boot system; do
+  for part in kernel root; do
     varname="${partitions_array}[${part}]"
     printf "md5sum of %s: " "${varname}"
     md5sum "${!varname}"