commit 7bd81a7d336ec0f9f215c85b0826a7139c2fedbc
author Tom Cherry <tomcherry@google.com> Thu Oct 19 00:14:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 19 00:14:21 2017 +0000
tree da53d99e4f508ff5e03b278f17a1b311b9bc8c9f
parent 6f4fb15913cc32e0d44c68fce4de178dbda23cda
parent 0ef62fc46462f3025b0be27e75eb9e76af81b4be

Merge "init: wait_for_prop shouldn't run in a subcontext"
am: 6e52973623

Change-Id: I160bedcb91668ccf2b663c36835871d21be2db8b

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 9be274b..950a551 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1033,7 +1033,7 @@
         {"verity_load_state",       {0,     0,    {false,  do_verity_load_state}}},
         {"verity_update_state",     {0,     0,    {false,  do_verity_update_state}}},
         {"wait",                    {1,     2,    {true,   do_wait}}},
-        {"wait_for_prop",           {2,     2,    {true,   do_wait_for_prop}}},
+        {"wait_for_prop",           {2,     2,    {false,  do_wait_for_prop}}},
         {"write",                   {2,     2,    {true,   do_write}}},
     };
     // clang-format on