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

Commit 17fff893 authored Jun 02, 2015 by Mark Salyzyn

init: change exec parsing to make SECLABEL optional

Allow SECLABEL to be - to denote default

Change-Id: I58cdc6c805dc6e50dc42b7e13e72d0eaf4864f11

parent 3ef730c5

init/init.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -380,7 +380,8 @@ void service_start(struct service svc, const char dynamic_args)

		if ((svc->flags & SVC_EXEC) != 0) {
		INFO("SVC_EXEC pid %d (uid %d gid %d+%zu context %s) started; waiting...\n",
		svc->pid, svc->uid, svc->gid, svc->nr_supp_gids, svc->seclabel);
		svc->pid, svc->uid, svc->gid, svc->nr_supp_gids,
		svc->seclabel ? : "default");
		waiting_for_exec = true;
		}

init/init_parser.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -664,6 +664,7 @@ int action_queue_empty()

		service* make_exec_oneshot_service(int nargs, char** args) {
		// Parse the arguments: exec [SECLABEL [UID [GID]*] --] COMMAND ARGS...
		// SECLABEL can be a - to denote default
		int command_arg = 1;
		for (int i = 1; i < nargs; ++i) {
		if (strcmp(args[i], "--") == 0) {
		@@ -689,7 +690,7 @@ service* make_exec_oneshot_service(int nargs, char** args) {
		return NULL;
		}

		if (command_arg > 2) {
		if ((command_arg > 2) && strcmp(args[1], "-")) {
		svc->seclabel = args[1];
		}
		if (command_arg > 3) {

init/readme.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -180,7 +180,7 @@ exec [ <seclabel> [ <user> [ <group> ]* ] ] -- <command> [ <argument> ]*
		Fork and execute command with the given arguments. The command starts
		after "--" so that an optional security context, user, and supplementary
		groups can be provided. No other commands will be run until this one
		finishes.
		finishes. <seclabel> can be a - to denote default.

		export <name> <value>
		Set the environment variable <name> equal to <value> in the