commit cb591fd0fdfed1bcaf54fce4fe248b7372488879
author daren.liao <daren.liao@mediatek.com> Thu Jul 14 14:54:59 2022 +0800
committer Alexander Martinz <amartinz@shiftphones.com> Tue Jul 23 17:30:58 2024 +0200
tree 0c6142280e6766f96376b47ae04aaec1d2d28d8d
parent b473b2b4e37e935fbca8c1491bec9d7aa23e2a26

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

1.In ANP, the path of the executable file recovery is sbin/recovery, and in ANR it is system/bin/recovery
2.Add a judgment on whether sbin/recovery exists in fs_mgr_fstab.cpp,
Make it possible to correctly load etc/recovery.fstab in recovery mode

Bug: 237368169
Change-Id: I8df76a003bc2edbaa01d9dd173a0cba1401ef3ac

fs_mgr/fs_mgr_fstab.cpp

diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index fc200b2..4940610 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -825,7 +825,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();