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

Merge "TransformFstabForDsu() skips handling special devices"

Browse source
This commit is contained in:
Yo Chiang 2020-11-04 03:30:31 +00:00 committed by Gerrit Code Review
commit 5ab4400db1
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs_mgr/fs_mgr_fstab.cpp
View file

@ -591,7 +591,7 @@ void TransformFstabForDsu(Fstab* fstab, const std::string& dsu_slot,
FstabEntry userdata;
if (FstabEntry* entry = GetEntryForMountPoint(fstab, "/data")) {
userdata = *entry;
userdata.blk_device = "userdata_gsi";
userdata.blk_device = android::gsi::kDsuUserdata;
userdata.fs_mgr_flags.logical = true;
userdata.fs_mgr_flags.formattable = true;
if (!userdata.metadata_key_dir.empty()) {
@ -611,7 +611,11 @@ void TransformFstabForDsu(Fstab* fstab, const std::string& dsu_slot,
continue;
}
// userdata has been handled
if (StartsWith(partition, "user")) {
if (partition == android::gsi::kDsuUserdata) {
continue;
}
// scratch is handled by fs_mgr_overlayfs
if (partition == android::gsi::kDsuScratch) {
continue;
}
// dsu_partition_name = corresponding_partition_name + kDsuPostfix