openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Adding GSI fstab entries when needed" 

am: 2baecf3c8f

Change-Id: I71824eec82427cf5c4a290e0b919952c7e4e6e76
This commit is contained in:
Bowgo Tsai 2019-02-19 16:47:44 -08:00 committed by android-build-merger
parent 44cac0c1b2 2baecf3c8f
commit 25ca652133
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