diff options
| author | Tudor Brindus <tbrindus@chromium.org> | 2018-07-10 23:55:51 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-07-11 18:48:45 -0700 |
| commit | b220d669d465377e2bb55a37a7028c72d93dcef3 (patch) | |
| tree | 694cb5ca136a0d6908fc72d9c6faa24595a84494 /scripts/update_payload/applier.py | |
| parent | 50a74d68e8667b3b1ffc21756e0371306426cd8c (diff) | |
update_payload: Make paycheck take "root" instead of "rootfs"
This commit makes paycheck take "root" as the rootfs partition label
instead of "rootfs", which makes it consistent with other tooling like
delta_generator.
BUG=chromium:794404
TEST=test_paycheck.sh and run_unittests
Change-Id: I20835e93adbcde459bc86d832e695b38bca55e38
Reviewed-on: https://chromium-review.googlesource.com/1132843
Commit-Ready: Tudor Brindus <tbrindus@chromium.org>
Tested-by: Tudor Brindus <tbrindus@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Diffstat (limited to 'scripts/update_payload/applier.py')
| -rw-r--r-- | scripts/update_payload/applier.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/update_payload/applier.py b/scripts/update_payload/applier.py index 49db8aee..c63e156c 100644 --- a/scripts/update_payload/applier.py +++ b/scripts/update_payload/applier.py @@ -643,13 +643,13 @@ class PayloadApplier(object): manifest = self.payload.manifest if self.payload.header.version == 1: - for name in common.CROS_PARTITIONS: - new_part_info[name] = getattr(manifest, 'new_%s_info' % name) - old_part_info[name] = getattr(manifest, 'old_%s_info' % name) + for real_name, proto_name in common.CROS_PARTITIONS: + new_part_info[real_name] = getattr(manifest, 'new_%s_info' % proto_name) + old_part_info[real_name] = getattr(manifest, 'old_%s_info' % proto_name) - install_operations.append((common.ROOTFS, manifest.install_operations)) - install_operations.append((common.KERNEL, - manifest.kernel_install_operations)) + install_operations.append((common.ROOTFS, manifest.install_operations)) + install_operations.append((common.KERNEL, + manifest.kernel_install_operations)) else: for part in manifest.partitions: name = part.partition_name |