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

Commit baf65305 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix new adb remount/overlayfs solution for older kernels" into main am:... 

Merge "Fix new adb remount/overlayfs solution for older kernels" into main am: c8b78c70 am: bb1a8d2a

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



Change-Id: Ie4b9b3089e6656e46e9c2cb095a579920f6bbd25
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f3a05ef bb1a8d2a

fs_mgr/fs_mgr.cpp

+8 −4
Original line number Diff line number Diff line
@@ -2336,10 +2336,6 @@ OverlayfsCheckResult CheckOverlayfs() { 
        return {.supported = false};

    }



    if (!use_override_creds) {

        return {.supported = true, ",userxattr"};

    }



    struct utsname uts;

    if (uname(&uts) == -1) {

        return {.supported = false};
@@ -2348,6 +2344,14 @@ OverlayfsCheckResult CheckOverlayfs() { 
    if (sscanf(uts.release, "%d.%d", &major, &minor) != 2) {

        return {.supported = false};

    }



    if (!use_override_creds) {

        if (major > 5 || (major == 5 && minor >= 15)) {

            return {.supported = true, ",userxattr"};

        }

        return {.supported = true};

    }



    // Overlayfs available in the kernel, and patched for override_creds?

    if (access("/sys/module/overlay/parameters/override_creds", F_OK) == 0) {

        auto mount_flags = ",override_creds=off"s;