summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2018-07-27 15:25:53 -0500
committerGerrit Code Review2018-07-27 15:25:53 -0500
commit0937a84521ca72ccb1972110a1935e6de0f7395f (patch)
treea3e7c5f739bd3e02ed006911b81efe187024f1ee
parentc1dabd8f76ba5065aa960c5d7218da66140c543c (diff)
parent5de2be5cd597bc6536f972aa85153f21f2512095 (diff)
downloadplatform-system-core-0937a84521ca72ccb1972110a1935e6de0f7395f.tar.gz
platform-system-core-0937a84521ca72ccb1972110a1935e6de0f7395f.tar.xz
platform-system-core-0937a84521ca72ccb1972110a1935e6de0f7395f.zip
Merge "Move recovery to /system/bin"
-rw-r--r--fs_mgr/fs_mgr_fstab.cpp2
-rw-r--r--init/first_stage_mount.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index a5b3fe833..8b46d64e2 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -811,7 +811,7 @@ struct fstab *fs_mgr_read_fstab_default()
811 std::string default_fstab; 811 std::string default_fstab;
812 812
813 // Use different fstab paths for normal boot and recovery boot, respectively 813 // Use different fstab paths for normal boot and recovery boot, respectively
814 if (access("/sbin/recovery", F_OK) == 0) { 814 if (access("/system/bin/recovery", F_OK) == 0) {
815 default_fstab = "/etc/recovery.fstab"; 815 default_fstab = "/etc/recovery.fstab";
816 } else { // normal boot 816 } else { // normal boot
817 default_fstab = get_fstab_path(); 817 default_fstab = get_fstab_path();
diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index 8ded87373..43075b268 100644
--- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp
@@ -116,7 +116,7 @@ static inline bool IsDtVbmetaCompatible() {
116} 116}
117 117
118static bool inline IsRecoveryMode() { 118static bool inline IsRecoveryMode() {
119 return access("/sbin/recovery", F_OK) == 0; 119 return access("/system/bin/recovery", F_OK) == 0;
120} 120}
121 121
122static inline bool IsDmLinearEnabled() { 122static inline bool IsDmLinearEnabled() {