tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "liblp: Support sdcards in PartitionOpener."

Browse source 
am: c5b3c88f8a

Change-Id: I464d2e9f39e49fb529dc4be11ac632ae4a9d6b34
This commit is contained in:
David Anderson 2019-08-22 12:54:01 -07:00 committed by android-build-merger
commit 272dae3005
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fs_mgr/liblp/partition_opener.cpp
View file

@ -41,7 +41,21 @@ std::string GetPartitionAbsolutePath(const std::string& path) {
if (android::base::StartsWith(path, "/")) {
return path;
}
return "/dev/block/by-name/" + path;
auto by_name = "/dev/block/by-name/" + path;
if (access(by_name.c_str(), F_OK) != 0) {
// If the by-name symlink doesn't exist, as a special case we allow
// certain devices to be used as partition names. This can happen if a
// Dynamic System Update is installed to an sdcard, which won't be in
// the boot device list.
//
// We whitelist because most devices in /dev/block are not valid for
// storing fiemaps.
if (android::base::StartsWith(path, "mmcblk")) {
return "/dev/block/" + path;
}
}
return by_name;
}
bool GetBlockDeviceInfo(const std::string& block_device, BlockDeviceInfo* device_info) {

16
init/first_stage_mount.cpp
View file

@ -602,19 +602,11 @@ void FirstStageMount::UseGsiIfPresent() {
return;
}
// Find the name of the super partition for the GSI. It will either be
// "userdata", or a block device such as an sdcard. There are no by-name
// partitions other than userdata that we support installing GSIs to.
// Find the super name. PartitionOpener will ensure this translates to the
// correct block device path.
auto super = GetMetadataSuperBlockDevice(*metadata.get());
std::string super_name = android::fs_mgr::GetBlockDevicePartitionName(*super);
std::string super_path;
if (super_name == "userdata") {
super_path = "/dev/block/by-name/" + super_name;
} else {
super_path = "/dev/block/" + super_name;
}
if (!android::fs_mgr::CreateLogicalPartitions(*metadata.get(), super_path)) {
auto super_name = android::fs_mgr::GetBlockDevicePartitionName(*super);
if (!android::fs_mgr::CreateLogicalPartitions(*metadata.get(), super_name)) {
LOG(ERROR) << "GSI partition layout could not be instantiated";
return;
}