Merge SP1A.210510.001

Change-Id: If7498b293041f2ae00fd93563417d60a0c13e7c9

1 files changed, 2 insertions, 1 deletions

diff --git a/payload_consumer/install_plan.cc b/payload_consumer/install_plan.cc
index 39827a4a..06b7dd8c 100644
--- a/payload_consumer/install_plan.cc
+++ b/payload_consumer/install_plan.cc
@@ -122,6 +122,7 @@ string InstallPlan::ToString() const {
                              partition.target_hash.size())},
             {"run_postinstall", utils::ToString(partition.run_postinstall)},
             {"postinstall_path", partition.postinstall_path},
+            {"readonly_target_path", partition.readonly_target_path},
             {"filesystem_type", partition.filesystem_type},
         },
         "\n  "));
@@ -165,7 +166,7 @@ bool InstallPlan::LoadPartitionsFromSlots(BootControlInterface* boot_control) {
           partition.name, target_slot, source_slot);
       TEST_AND_RETURN_FALSE(device.has_value());
       partition.target_path = device->rw_device_path;
-      partition.postinstall_mount_device = device->mountable_device_path;
+      partition.readonly_target_path = device->readonly_device_path;
     } else {
       partition.target_path.clear();
     }