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

Merge "Adding GSI fstab entries when needed" am: 2baecf3c8f

Browse source 
am: 25ca652133

Change-Id: I9a7074a7793cb8f9c1cc4363e2a567b1a0d09586
This commit is contained in:
Bowgo Tsai 2019-02-19 16:52:56 -08:00 • committed by android-build-merger
commit b95241b9aa
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fs_mgr/fs_mgr_fstab.cpp
View file

@ -607,10 +607,14 @@ FstabEntry BuildGsiUserdataFstabEntry() {
return userdata;
}
void EraseFstabEntry(Fstab* fstab, const std::string& mount_point) {
bool EraseFstabEntry(Fstab* fstab, const std::string& mount_point) {
auto iter = std::remove_if(fstab->begin(), fstab->end(),
[&](const auto& entry) { return entry.mount_point == mount_point; });
fstab->erase(iter, fstab->end());
if (iter != fstab->end()) {
fstab->erase(iter, fstab->end());
return true;
}
return false;
}
void TransformFstabForGsi(Fstab* fstab) {
@ -628,11 +632,13 @@ void TransformFstabForGsi(Fstab* fstab) {
userdata = BuildGsiUserdataFstabEntry();
}
EraseFstabEntry(fstab, "/system");
EraseFstabEntry(fstab, "/data");
if (EraseFstabEntry(fstab, "/system")) {
fstab->emplace_back(BuildGsiSystemFstabEntry());
}
fstab->emplace_back(BuildGsiSystemFstabEntry());
fstab->emplace_back(userdata);
if (EraseFstabEntry(fstab, "/data")) {
fstab->emplace_back(userdata);
}
}
} // namespace