commit a9665ced57ebd3f00f11cd8d9d99b33269687286
author Alessio Balsini <balsini@google.com> Mon Dec 09 09:26:05 2019 +0000
committer Alessio Balsini <balsini@google.com> Mon Dec 16 21:25:45 2019 +0000
tree 74552b4a0de01c3f51c1a9e487a879ceda7499e2
parent 38f07f0ba4fb03e7bfcb51264bfc1c61fcbe29f3

Mount snapshotted /system in Virtual A/B devices

Mounting /system in Virtual A/B devices may require the creation of the
associated snapshot devices.
This patch performs all the required initializations prior to attempting
the mount of /system.

Bug: 139157327
Test: manual /system partition mount on VAB device during OTA
Depends-on: I7337bdd38d7016d12d3ee42be1c7893b10e9116d
Change-Id: I71a9dfc57e1a1354f1f1edc5d287aca93c0c8924
Signed-off-by: Alessio Balsini <balsini@google.com>

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index f59a940..e4b8e45 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -50,6 +50,7 @@
 #include "install/fuse_install.h"
 #include "install/install.h"
 #include "install/package.h"
+#include "install/snapshot_utils.h"
 #include "install/wipe_data.h"
 #include "install/wipe_device.h"
 #include "otautil/boot_state.h"
@@ -437,7 +438,13 @@
         screen_ui->CheckBackgroundTextImages();
         break;
       }
+
       case Device::MOUNT_SYSTEM:
+        // For Virtual A/B, set up the snapshot devices (if exist).
+        if (!CreateSnapshotPartitions()) {
+          ui->Print("Virtual A/B: snapshot partitions creation failed.\n");
+          break;
+        }
         if (ensure_path_mounted_at(android::fs_mgr::GetSystemRoot(), "/mnt/system") != -1) {
           ui->Print("Mounted /system.\n");
         }