summaryrefslogtreecommitdiffstats
path: root/init/init.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-06-02 11:11:02 -0700
committerMark Salyzyn <salyzyn@google.com>2015-06-02 15:17:52 -0700
commit17fff893c04971b519d25d52b07f51111353cba5 (patch)
treebcd727357959e02a0e4e97af7edf385265bdaa8e /init/init.cpp
parent3ef730c57f88ac24b0d6b021e43fc344d602fe36 (diff)
downloadcore-17fff893c04971b519d25d52b07f51111353cba5.tar.gz
core-17fff893c04971b519d25d52b07f51111353cba5.tar.bz2
core-17fff893c04971b519d25d52b07f51111353cba5.zip
init: change exec parsing to make SECLABEL optional
Allow SECLABEL to be - to denote default Change-Id: I58cdc6c805dc6e50dc42b7e13e72d0eaf4864f11
Diffstat (limited to 'init/init.cpp')
-rw-r--r--init/init.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/init/init.cpp b/init/init.cpp
index 60fcf6463..250098536 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -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;
}