commit 0937a84521ca72ccb1972110a1935e6de0f7395f
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 27 20:25:53 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 27 20:25:53 2018 +0000
tree a3e7c5f739bd3e02ed006911b81efe187024f1ee
parent c1dabd8f76ba5065aa960c5d7218da66140c543c
parent 5de2be5cd597bc6536f972aa85153f21f2512095

Merge "Move recovery to /system/bin"

fs_mgr/fs_mgr_fstab.cpp

diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index a5b3fe8..8b46d64 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -811,7 +811,7 @@
     std::string default_fstab;
 
     // Use different fstab paths for normal boot and recovery boot, respectively
-    if (access("/sbin/recovery", F_OK) == 0) {
+    if (access("/system/bin/recovery", F_OK) == 0) {
         default_fstab = "/etc/recovery.fstab";
     } else {  // normal boot
         default_fstab = get_fstab_path();

init/first_stage_mount.cpp

diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index 8ded873..43075b2 100644
--- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp
@@ -116,7 +116,7 @@
 }
 
 static bool inline IsRecoveryMode() {
-    return access("/sbin/recovery", F_OK) == 0;
+    return access("/system/bin/recovery", F_OK) == 0;
 }
 
 static inline bool IsDmLinearEnabled() {