commit dd0e3162a598cd6bfe92d5c903e66563fc152e50
author Mark Salyzyn <salyzyn@google.com> Wed May 27 10:46:54 2015 -0700
committer Mark Salyzyn <salyzyn@google.com> Wed May 27 14:06:28 2015 -0700
tree 42ab5ea00e9abf9ec606e82c33e8c867711bbbe9
parent 3464c77b8d1b22b7f87c27b4a142c5e7b2032571

init: expand_props on trigger

Bug: 19608716
Change-Id: Ifce8bfde04f8e6f707245e0b53400072d94447b2

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;
 }