commit f4753d1cc54a4cd207fef01794a73758bf3d71f2
author David Anderson <dvander@google.com> Tue Jul 19 21:11:55 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 19 21:11:55 2022 +0000
tree b97066148d32511ed8c59dc5c28c8f17333ebd51
parent f3e6cf0a7655b9ec80bc687433654ebdf3006244
parent cadee353fa7a1c073160a2cae2b8f6b9eb19e096

Merge "Fix for Cannot load etc/recovery.fstab when doing OTA upgrade"

fs_mgr/fs_mgr_fstab.cpp

diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index f1071b0..bf471ba 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -804,7 +804,7 @@
 
     std::string default_fstab_path;
     // Use different fstab paths for normal boot and recovery boot, respectively
-    if (access("/system/bin/recovery", F_OK) == 0) {
+    if ((access("/sbin/recovery", F_OK) == 0) || (access("/system/bin/recovery", F_OK) == 0)) {
         default_fstab_path = "/etc/recovery.fstab";
     } else {  // normal boot
         default_fstab_path = GetFstabPath();