Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a2c31ef authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc4e34d34eceb545d15e1726bfb40f6ef5699e6d
parents 48c48867 937611f8

fs_mgr/fs_mgr_fstab.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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;