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

Merge "first_stage_mount: Remove "overlay" hack from InitRequiredDevices()" am: b440fc9c06

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1711245

Change-Id: I56f2959e358de2c1aec123a1560734487e0e955e
This commit is contained in:
Yo Chiang 2021-05-20 06:52:11 +00:00 committed by Automerger Merge Worker
commit 99893a20f7
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
init/first_stage_mount.cpp
View file

@ -331,12 +331,6 @@ bool FirstStageMount::InitRequiredDevices(std::set<std::string> devices) {
if (devices.empty()) {
return true;
}
// excluding overlays
for (auto iter = devices.begin(); iter != devices.end(); ) {
if (*iter=="overlay") iter = devices.erase(iter);
else iter++;
}
return block_dev_init_.InitDevices(std::move(devices));
}
@ -695,6 +689,10 @@ bool FirstStageMountVBootV1::GetDmVerityDevices(std::set<std::string>* devices)
// Includes the partition names of fstab records.
// Notes that fstab_rec->blk_device has A/B suffix updated by fs_mgr when A/B is used.
for (const auto& fstab_entry : fstab_) {
// Skip pseudo filesystems.
if (fstab_entry.fs_type == "overlay") {
continue;
}
if (!fstab_entry.fs_mgr_flags.logical) {
devices->emplace(basename(fstab_entry.blk_device.c_str()));
}
@ -757,6 +755,10 @@ bool FirstStageMountVBootV2::GetDmVerityDevices(std::set<std::string>* devices)
if (fstab_entry.fs_mgr_flags.avb) {
need_dm_verity_ = true;
}
// Skip pseudo filesystems.
if (fstab_entry.fs_type == "overlay") {
continue;
}
if (fstab_entry.fs_mgr_flags.logical) {
// Don't try to find logical partitions via uevent regeneration.
logical_partitions.emplace(basename(fstab_entry.blk_device.c_str()));