ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Support mounting same mount points with different fstab config"

Browse source
This commit is contained in:
Tom Cherry 2019-01-10 23:36:16 +00:00 • committed by Gerrit Code Review
commit 82b8e518e3
1 changed files with 44 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
init/first_stage_mount.cpp
View file

@ -414,16 +414,32 @@ bool FirstStageMount::TrySwitchSystemAsRoot() {
return entry.mount_point == "/system";
});
if (system_partition != fstab_.end()) {
if (!MountPartition(&(*system_partition))) {
return false;
if (system_partition == fstab_.end()) return true;
bool mounted = false;
bool no_fail = false;
for (auto it = system_partition; it != fstab_.end();) {
if (it->mount_point != "/system") {
break;
}
SwitchRoot((*system_partition).mount_point);
fstab_.erase(system_partition);
no_fail |= (it->fs_mgr_flags).no_fail;
if (MountPartition(&(*it))) {
mounted = true;
SwitchRoot("/system");
break;
}
it++;
}
if (!mounted && !no_fail) {
LOG(ERROR) << "Failed to mount /system";
return false;
}
auto it = std::remove_if(fstab_.begin(), fstab_.end(),
[](const auto& entry) { return entry.mount_point == "/system"; });
fstab_.erase(it, fstab_.end());
return true;
}
@ -444,14 +460,12 @@ bool FirstStageMount::TrySkipMountingPartitions() {
if (skip_mount_point.empty()) {
continue;
}
auto removing_entry =
std::find_if(fstab_.begin(), fstab_.end(), [&skip_mount_point](const auto& entry) {
return entry.mount_point == skip_mount_point;
});
if (removing_entry != fstab_.end()) {
fstab_.erase(removing_entry);
LOG(INFO) << "Skip mounting partition: " << skip_mount_point;
}
auto it = std::remove_if(fstab_.begin(), fstab_.end(),
[&skip_mount_point](const auto& entry) {
return entry.mount_point == skip_mount_point;
});
fstab_.erase(it, fstab_.end());
LOG(INFO) << "Skip mounting partition: " << skip_mount_point;
}
return true;
@ -462,8 +476,21 @@ bool FirstStageMount::MountPartitions() {
if (!TrySkipMountingPartitions()) return false;
for (auto& fstab_entry : fstab_) {
if (!MountPartition(&fstab_entry) && !fstab_entry.fs_mgr_flags.no_fail) {
for (auto it = fstab_.begin(); it != fstab_.end();) {
bool mounted = false;
bool no_fail = false;
auto start_mount_point = it->mount_point;
do {
no_fail |= (it->fs_mgr_flags).no_fail;
if (!mounted)
mounted = MountPartition(&(*it));
else
LOG(INFO) << "Skip already-mounted partition: " << start_mount_point;
it++;
} while (it != fstab_.end() && it->mount_point == start_mount_point);
if (!mounted && !no_fail) {
LOG(ERROR) << start_mount_point << " mounted unsuccessfully but it is required!";
return false;
}
}