Merge "init: apexd is started in the current mount namespace" am: 778f2b6837

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

Change-Id: Idad0e1d4fbe834c754e7241a3c15b6a2ff2dc2ed
This commit is contained in:
Treehugger Robot 2021-04-21 05:53:19 +00:00 committed by Automerger Merge Worker
commit fe5f60d051

View file

@ -460,7 +460,11 @@ Result<void> Service::Start() {
scon = *result;
}
if (!IsDefaultMountNamespaceReady() && name_ != "apexd") {
// APEXd is always started in the "current" namespace because it is the process to set up
// the current namespace.
const bool is_apexd = args_[0] == "/system/bin/apexd";
if (!IsDefaultMountNamespaceReady() && !is_apexd) {
// If this service is started before APEXes and corresponding linker configuration
// get available, mark it as pre-apexd one. Note that this marking is
// permanent. So for example, if the service is re-launched (e.g., due