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

Commit 459ca0be authored by Tom Cherry's avatar Tom Cherry
Browse files

Revert "Stop & Resume property service when switching to bootstrap namespace" 

Dependent change was reverted.

This reverts commit 352ae2d2.

Bug: 150863651
Test: build
Change-Id: I2e11b782fcd2b7baded133a841fdcf519f702b84
parent 14326821

init/mount_namespace.cpp

+0 −10
Original line number Diff line number Diff line
@@ -323,20 +323,10 @@ bool SwitchToBootstrapMountNamespaceIfNeeded() { 
    }

    if (bootstrap_ns_id != GetMountNamespaceId() && bootstrap_ns_fd.get() != -1 &&

        IsApexUpdatable()) {

        // The property service thread and its descendent threads must be in the correct mount

        // namespace to call Service::Start(), however setns() only operates on a single thread and

        // fails when secondary threads attempt to join the same mount namespace.  Therefore, we

        // must join the property service thread and its descendents before the setns() call.  Those

        // threads are then started again after the setns() call, and they'll be in the proper

        // namespace.

        PausePropertyService();



        if (setns(bootstrap_ns_fd.get(), CLONE_NEWNS) == -1) {

            PLOG(ERROR) << "Failed to switch to bootstrap mount namespace.";

            return false;

        }



        ResumePropertyService();

    }

    return true;

}