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

Commit aecdfcb6 authored by Jerry Zhang's avatar Jerry Zhang Committed by android-build-merger
Browse files

Merge "Move recovery to /system/bin" am: 0937a845 am: 3051d549 

am: 13f95ea1

Change-Id: I7e893773aab0e0e1bfa2d28bcea9c3e3c06be826
parents 9dc2f1ae 13f95ea1

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() {