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

Commit c76533b6 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "Fix for Cannot load etc/recovery.fstab when doing OTA upgrade" am:... 

Merge "Fix for Cannot load etc/recovery.fstab when doing OTA upgrade" am: f4753d1c am: f1762460 am: 6d867d53

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2153356



Change-Id: I8e7a2b189bf64915623327965af33426e83a7e29
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1b3104b 6d867d53

fs_mgr/fs_mgr_fstab.cpp

+1 −1
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ bool ReadDefaultFstab(Fstab* fstab) { 


    std::string default_fstab_path;

    // Use different fstab paths for normal boot and recovery boot, respectively

    if (access("/system/bin/recovery", F_OK) == 0) {

    if ((access("/sbin/recovery", F_OK) == 0) || (access("/system/bin/recovery", F_OK) == 0)) {

        default_fstab_path = "/etc/recovery.fstab";

    } else {  // normal boot

        default_fstab_path = GetFstabPath();