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

Merge changes from topic "ReadDefaultFstab_requires_sepolicies" am: aeb962f09a

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

Change-Id: I6ebdb5602f3c6e824822a1766522d66876c0f57a
This commit is contained in:
Yo Chiang 2021-04-06 04:20:30 +00:00 • committed by Automerger Merge Worker
commit 127e1bee5f
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fs_mgr/fs_mgr_fstab.cpp
View file

@ -680,7 +680,7 @@ void EnableMandatoryFlags(Fstab* fstab) {
}
}
bool ReadFstabFromFile(const std::string& path, Fstab* fstab) {
bool ReadFstabFromFile(const std::string& path, Fstab* fstab_out) {
auto fstab_file = std::unique_ptr<FILE, decltype(&fclose)>{fopen(path.c_str(), "re"), fclose};
if (!fstab_file) {
PERROR << __FUNCTION__ << "(): cannot open file: '" << path << "'";
@ -689,7 +689,8 @@ bool ReadFstabFromFile(const std::string& path, Fstab* fstab) {
bool is_proc_mounts = path == "/proc/mounts";
if (!ReadFstabFile(fstab_file.get(), is_proc_mounts, fstab)) {
Fstab fstab;
if (!ReadFstabFile(fstab_file.get(), is_proc_mounts, &fstab)) {
LERROR << __FUNCTION__ << "(): failed to load fstab from : '" << path << "'";
return false;
}
@ -714,16 +715,17 @@ bool ReadFstabFromFile(const std::string& path, Fstab* fstab) {
PERROR << __FUNCTION__ << "(): failed to read DSU LP names";
return false;
}
TransformFstabForDsu(fstab, dsu_slot, Split(lp_names, ","));
TransformFstabForDsu(&fstab, dsu_slot, Split(lp_names, ","));
} else if (errno != ENOENT) {
PERROR << __FUNCTION__ << "(): failed to access() DSU booted indicator";
return false;
}
}
SkipMountingPartitions(fstab, false /* verbose */);
EnableMandatoryFlags(fstab);
SkipMountingPartitions(&fstab, false /* verbose */);
EnableMandatoryFlags(&fstab);
*fstab_out = std::move(fstab);
return true;
}
@ -798,10 +800,8 @@ bool SkipMountingPartitions(Fstab* fstab, bool verbose) {
// Loads the fstab file and combines with fstab entries passed in from device tree.
bool ReadDefaultFstab(Fstab* fstab) {
Fstab dt_fstab;
ReadFstabFromDt(&dt_fstab, false /* verbose */);
*fstab = std::move(dt_fstab);
fstab->clear();
ReadFstabFromDt(fstab, false /* verbose */);
std::string default_fstab_path;
// Use different fstab paths for normal boot and recovery boot, respectively