recovery: Support writing to Virtual A/B partitions

Change-Id: Ice74e460242a58140fe31240b9fc464848b3aeea
This commit is contained in:
aleasto 2021-01-17 20:31:22 +01:00 committed by zlewchan
parent 2034cc3d05
commit 128d724d3b
3 changed files with 46 additions and 14 deletions

View file

@ -46,6 +46,7 @@
#include <android-base/strings.h> #include <android-base/strings.h>
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include "install/snapshot_utils.h"
#include "install/spl_check.h" #include "install/spl_check.h"
#include "install/wipe_data.h" #include "install/wipe_data.h"
#include "install/wipe_device.h" #include "install/wipe_device.h"
@ -408,6 +409,7 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache,
bool device_supports_ab = android::base::GetBoolProperty("ro.build.ab_update", false); bool device_supports_ab = android::base::GetBoolProperty("ro.build.ab_update", false);
bool ab_device_supports_nonab = true; bool ab_device_supports_nonab = true;
bool device_only_supports_ab = device_supports_ab && !ab_device_supports_nonab; bool device_only_supports_ab = device_supports_ab && !ab_device_supports_nonab;
bool device_supports_virtual_ab = android::base::GetBoolProperty("ro.virtual_ab.enabled", false);
/*const auto current_spl = android::base::GetProperty("ro.build.version.security_patch", ""); /*const auto current_spl = android::base::GetProperty("ro.build.version.security_patch", "");
if (ViolatesSPLDowngrade(zip, current_spl)) { if (ViolatesSPLDowngrade(zip, current_spl)) {
@ -430,6 +432,15 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache,
} }
} }
if (!package_is_ab && !logical_partitions_mapped()) {
CreateSnapshotPartitions();
map_logical_partitions();
} else if (package_is_ab && device_supports_virtual_ab && logical_partitions_mapped()) {
LOG(ERROR) << "Logical partitions are mapped. "
<< "Please reboot recovery before installing an OTA update.";
return INSTALL_ERROR;
}
ReadSourceTargetBuild(metadata, log_buffer); ReadSourceTargetBuild(metadata, log_buffer);
// The updater in child process writes to the pipe to communicate with recovery. // The updater in child process writes to the pipe to communicate with recovery.

View file

@ -62,4 +62,6 @@ int setup_install_mounts();
// Returns true if there is /cache in the volumes. // Returns true if there is /cache in the volumes.
bool HasCache(); bool HasCache();
void map_logical_partitions();
bool logical_partitions_mapped(); bool logical_partitions_mapped();

View file

@ -46,6 +46,8 @@
using android::fs_mgr::Fstab; using android::fs_mgr::Fstab;
using android::fs_mgr::FstabEntry; using android::fs_mgr::FstabEntry;
using android::fs_mgr::ReadDefaultFstab; using android::fs_mgr::ReadDefaultFstab;
using android::dm::DeviceMapper;
using android::dm::DmDeviceState;
static void write_fstab_entry(const FstabEntry& entry, FILE* file) { static void write_fstab_entry(const FstabEntry& entry, FILE* file) {
if (entry.fs_type != "emmc" && !entry.fs_mgr_flags.vold_managed && !entry.blk_device.empty() && if (entry.fs_type != "emmc" && !entry.fs_mgr_flags.vold_managed && !entry.blk_device.empty() &&
@ -372,8 +374,6 @@ int format_volume(const std::string& volume) {
return format_volume(volume, "", ""); return format_volume(volume, "", "");
} }
static bool logical_partitions_auto_mapped = false;
int setup_install_mounts() { int setup_install_mounts() {
if (fstab.empty()) { if (fstab.empty()) {
LOG(ERROR) << "can't set up install mounts: no fstab loaded"; LOG(ERROR) << "can't set up install mounts: no fstab loaded";
@ -397,16 +397,6 @@ int setup_install_mounts() {
} }
} }
} }
// Map logical partitions
if (android::base::GetBoolProperty("ro.boot.dynamic_partitions", false) &&
!logical_partitions_mapped()) {
std::string super_name = fs_mgr_get_super_partition_name();
if (!android::fs_mgr::CreateLogicalPartitions("/dev/block/by-name/" + super_name)) {
LOG(ERROR) << "Failed to map logical partitions";
} else {
logical_partitions_auto_mapped = true;
}
}
return 0; return 0;
} }
@ -416,6 +406,35 @@ bool HasCache() {
return has_cache; return has_cache;
} }
bool logical_partitions_mapped() { static bool logical_partitions_auto_mapped = false;
return android::fs_mgr::LogicalPartitionsMapped() || logical_partitions_auto_mapped;
void map_logical_partitions() {
if (android::base::GetBoolProperty("ro.boot.dynamic_partitions", false) &&
!logical_partitions_mapped()) {
std::string super_name = fs_mgr_get_super_partition_name();
if (!android::fs_mgr::CreateLogicalPartitions("/dev/block/by-name/" + super_name)) {
LOG(ERROR) << "Failed to map logical partitions";
} else {
logical_partitions_auto_mapped = true;
}
}
}
bool dm_find_system() {
auto rec = GetEntryForPath(&fstab, android::fs_mgr::GetSystemRoot());
if (!rec->fs_mgr_flags.logical) {
return false;
}
// If the fstab entry for system it's a path instead of a name, then it was already mapped
if (rec->blk_device[0] != '/') {
if (DeviceMapper::Instance().GetState(rec->blk_device) == DmDeviceState::INVALID) {
return false;
}
}
return true;
}
bool logical_partitions_mapped() {
return android::fs_mgr::LogicalPartitionsMapped() || logical_partitions_auto_mapped ||
dm_find_system();
} }