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

Merge "Search fstab also from /first_stage_ramdisk" am: 937611f843

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc4e34d34eceb545d15e1726bfb40f6ef5699e6d
This commit is contained in:
Treehugger Robot 2021-03-02 20:15:33 +00:00 • committed by Automerger Merge Worker
commit 7a2c31ef92
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs_mgr/fs_mgr_fstab.cpp
View file

@ -412,7 +412,8 @@ std::string GetFstabPath() {
if (!fs_mgr_get_boot_config(prop, &suffix)) continue;
for (const char* prefix : {"/odm/etc/fstab.", "/vendor/etc/fstab.", "/fstab."}) {
for (const char* prefix :
{"/odm/etc/fstab.", "/vendor/etc/fstab.", "/fstab.", "/first_stage_ramdisk/fstab."}) {
std::string fstab_path = prefix + suffix;
if (access(fstab_path.c_str(), F_OK) == 0) {
return fstab_path;