Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5de2be5c authored by Jerry Zhang's avatar Jerry Zhang Committed by Hridya Valsaraju
Browse files

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
parent 1c92fa44

fs_mgr/fs_mgr_fstab.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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();

init/first_stage_mount.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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() {