Merge "init: add exec_background command"

am: 424ed42fb4

Change-Id: I9529146ea9b29b2fb2e2c92f3533efc4e3106943
This commit is contained in:
Tom Cherry 2017-09-18 21:37:38 +00:00 committed by android-build-merger
commit a6d75117e2
2 changed files with 19 additions and 0 deletions

View file

@ -381,6 +381,11 @@ Commands
within _argument_.
Init halts executing commands until the forked process exits.
`exec_background [ <seclabel> [ <user> [ <group>\* ] ] ] -- <command> [ <argument>\* ]`
> Fork and execute command with the given arguments. This is handled similarly
to the `exec` command. The difference is that init does not halt executing
commands until the process exits for `exec_background`.
`exec_start <service>`
> Start a given service and halt the processing of additional init commands
until it returns. The command functions similarly to the `exec` command,

View file

@ -148,6 +148,19 @@ static Result<Success> do_exec(const std::vector<std::string>& args) {
return Success();
}
static Result<Success> do_exec_background(const std::vector<std::string>& args) {
auto service = Service::MakeTemporaryOneshotService(args);
if (!service) {
return Error() << "Could not create exec background service";
}
if (auto result = service->Start(); !result) {
return Error() << "Could not start exec background service: " << result.error();
}
ServiceList::GetInstance().AddService(std::move(service));
return Success();
}
static Result<Success> do_exec_start(const std::vector<std::string>& args) {
Service* service = ServiceList::GetInstance().FindService(args[1]);
if (!service) {
@ -978,6 +991,7 @@ const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const {
{"domainname", {1, 1, do_domainname}},
{"enable", {1, 1, do_enable}},
{"exec", {1, kMax, do_exec}},
{"exec_background", {1, kMax, do_exec_background}},
{"exec_start", {1, 1, do_exec_start}},
{"export", {2, 2, do_export}},
{"hostname", {1, 1, do_hostname}},