From 5de2be5cd597bc6536f972aa85153f21f2512095 Mon Sep 17 00:00:00 2001 From: Jerry Zhang Date: Tue, 3 Jul 2018 16:03:28 -0700 Subject: [PATCH] Move recovery to /system/bin Executables should be in /system/bin rather than sbin. Change lookup paths in a few places to reflect this. Test: recovery is in system/bin Bug: 78793464 Change-Id: Ibcdff7abf1f21e2566e02cad8bdb3c26ee500534 --- fs_mgr/fs_mgr_fstab.cpp | 2 +- init/first_stage_mount.cpp | 2 +- 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() 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(); 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() { } static bool inline IsRecoveryMode() { - return access("/sbin/recovery", F_OK) == 0; + return access("/system/bin/recovery", F_OK) == 0; } static inline bool IsDmLinearEnabled() {