commit 80512f2d2eb6b8d43ad54efa185c1013194ba91c
author Mark Salyzyn <salyzyn@google.com> Thu May 28 15:52:24 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 28 15:52:25 2015 +0000
tree 45718b62fcf55c2a82a17544b79c69e02100c70a
parent bdb8b5f448e543afa3a8d7e371e597d252d8da6d
parent 50d6d13a10e2790795e66b6200545eef33307739

Merge "init: expand_props on trigger"

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 9e5f9ff..ca31c50 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -591,7 +591,13 @@
 
 int do_trigger(int nargs, char **args)
 {
-    action_for_each_trigger(args[1], action_add_queue_tail);
+    char prop_val[PROP_VALUE_MAX];
+    int res = expand_props(prop_val, args[1], sizeof(prop_val));
+    if (res) {
+        ERROR("trigger: cannot expand '%s'\n", args[1]);
+        return -EINVAL;
+    }
+    action_for_each_trigger(prop_val, action_add_queue_tail);
     return 0;
 }