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

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

Merge "Preserve environment when launching overlay_remounter" into main am:...

Merge "Preserve environment when launching overlay_remounter" into main am: 3250a0a2 am: 9e541447

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



Change-Id: Iaf646f15d677bde6d805ff8b7766df63972c9a66
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e892c156 9e541447
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ void SetupOverlays() {
        PLOG(FATAL) << "Failed to unlink " << or_dest;
    }
    const char* args[] = {or_dest.c_str(), nullptr};
    fexecve(dest.get(), const_cast<char**>(args), nullptr);
    fexecve(dest.get(), const_cast<char**>(args), environ);

    // execv() only returns if an error happened, in which case we
    // panic and never return from this function.