commit 937611f843f20a5ea16a8f081f409edce04bd81f
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 02 06:20:37 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 02 06:20:37 2021 +0000
tree 1b13d1eba47b5c6bb187498440e5b42cd55e0314
parent ce519b8a979d446a91d2d1f95fab9e1bf6c0dfbd
parent 7e7b7a156aeb14d264de0601c341d64b42fd07a0

Merge "Search fstab also from /first_stage_ramdisk"

fs_mgr/fs_mgr_fstab.cpp

diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index 8ac3361..785a8e0 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -412,7 +412,8 @@
 
         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;