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

Commit 091c4d14 authored by Nikita Ioffe's avatar Nikita Ioffe
Browse files

Remove service defined in an APEX during userspace reboot 

Such services will be re-parsed and added back to the service list
during post-fs-data stage.

Test: adb reboot userspace
Test: atest CtsInitTestCases
Bug: 145669993
Bug: 135984674
Change-Id: Ibb393dfe0f101c4ebe37bc763733fd5d981d3691
parent 028e1d44

init/builtins.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1180,7 +1180,7 @@ static Result<void> do_parse_apex_configs(const BuiltinArguments& args) { 
        return Error() << "glob pattern '" << glob_pattern << "' failed";

    }

    std::vector<std::string> configs;

    Parser parser = CreateServiceOnlyParser(ServiceList::GetInstance());

    Parser parser = CreateServiceOnlyParser(ServiceList::GetInstance(), true);

    for (size_t i = 0; i < glob_result.gl_pathc; i++) {

        std::string path = glob_result.gl_pathv[i];

        // Filter-out /apex/<name>@<ver> paths. The paths are bind-mounted to

init/init.cpp

+4 −3
Original line number Diff line number Diff line
@@ -123,11 +123,12 @@ Parser CreateParser(ActionManager& action_manager, ServiceList& service_list) { 
}



// parser that only accepts new services

Parser CreateServiceOnlyParser(ServiceList& service_list) {

Parser CreateServiceOnlyParser(ServiceList& service_list, bool from_apex) {

    Parser parser;



    parser.AddSectionParser("service", std::make_unique<ServiceParser>(

                                               &service_list, subcontext.get(), std::nullopt));

    parser.AddSectionParser("service",

                            std::make_unique<ServiceParser>(&service_list, subcontext.get(),

                                                            std::nullopt, from_apex));

    return parser;

}

init/init.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ namespace android { 
namespace init {



Parser CreateParser(ActionManager& action_manager, ServiceList& service_list);

Parser CreateServiceOnlyParser(ServiceList& service_list);

Parser CreateServiceOnlyParser(ServiceList& service_list, bool from_apex);



bool start_waiting_for_property(const char *name, const char *value);

init/reboot.cpp

+8 −0
Original line number Diff line number Diff line
@@ -798,6 +798,14 @@ static Result<void> DoUserspaceReboot() { 
    if (!SwitchToBootstrapMountNamespaceIfNeeded()) {

        return Error() << "Failed to switch to bootstrap namespace";

    }

    // Remove services that were defined in an APEX.

    ServiceList::GetInstance().RemoveServiceIf([](const std::unique_ptr<Service>& s) -> bool {

        if (s->is_from_apex()) {

            LOG(INFO) << "Removing service '" << s->name() << "' because it's defined in an APEX";

            return true;

        }

        return false;

    });

    // Re-enable services

    for (const auto& s : were_enabled) {

        LOG(INFO) << "Re-enabling service '" << s->name() << "'";

init/service.cpp

+6 −5
Original line number Diff line number Diff line
@@ -131,13 +131,13 @@ unsigned long Service::next_start_order_ = 1; 
bool Service::is_exec_service_running_ = false;



Service::Service(const std::string& name, Subcontext* subcontext_for_restart_commands,

                 const std::vector<std::string>& args)

    : Service(name, 0, 0, 0, {}, 0, "", subcontext_for_restart_commands, args) {}

                 const std::vector<std::string>& args, bool from_apex)

    : Service(name, 0, 0, 0, {}, 0, "", subcontext_for_restart_commands, args, from_apex) {}



Service::Service(const std::string& name, unsigned flags, uid_t uid, gid_t gid,

                 const std::vector<gid_t>& supp_gids, int namespace_flags,

                 const std::string& seclabel, Subcontext* subcontext_for_restart_commands,

                 const std::vector<std::string>& args)

                 const std::vector<std::string>& args, bool from_apex)

    : name_(name),

      classnames_({"default"}),

      flags_(flags),
@@ -155,7 +155,8 @@ Service::Service(const std::string& name, unsigned flags, uid_t uid, gid_t gid, 
                 "onrestart", {}),

      oom_score_adjust_(DEFAULT_OOM_SCORE_ADJUST),

      start_order_(0),

      args_(args) {}

      args_(args),

      from_apex_(from_apex) {}



void Service::NotifyStateChange(const std::string& new_state) const {

    if ((flags_ & SVC_TEMPORARY) != 0) {
@@ -763,7 +764,7 @@ Result<std::unique_ptr<Service>> Service::MakeTemporaryOneshotService( 
    }



    return std::make_unique<Service>(name, flags, *uid, *gid, supp_gids, namespace_flags, seclabel,

                                     nullptr, str_args);

                                     nullptr, str_args, false);

}



}  // namespace init