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

Commit b1187622 authored by Nick Kralevich's avatar Nick Kralevich
Browse files

Revert "adb: Make HOME=/data/local/tmp" 

During early boot, we may be mounting and unmounting /data.
Having the home directory for adb shell commands, such as
"adb shell logcat", on the /data directory prevents unmounting.

This reverts commit 173eb396.

Bug: 26132185
Change-Id: Ib7c2f9e696f52bf5bbb79223d90dd76791779587
parent 173eb396

adb/shell_service.cpp

+1 −2
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ bool Subprocess::ForkAndExec() { 
        // TODO: $HOSTNAME? Normally bash automatically sets that, but mksh doesn't.

        passwd* pw = getpwuid(getuid());

        if (pw != nullptr) {

            setenv("HOME", pw->pw_dir, 1);

            setenv("LOGNAME", pw->pw_name, 1);

            setenv("SHELL", pw->pw_shell, 1);

            setenv("USER", pw->pw_name, 1);
@@ -297,8 +298,6 @@ bool Subprocess::ForkAndExec() { 
            setenv("TERM", terminal_type_.c_str(), 1);

        }



        setenv("HOME", "/data/local/tmp", 1);

        chdir(getenv("HOME"));

        if (is_interactive()) {

            execl(_PATH_BSHELL, _PATH_BSHELL, "-", nullptr);

        } else {