commit afcd36c12f757c58bece00c78538639f626fe721
author Tom Cherry <tomcherry@google.com> Thu Oct 19 00:19:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 19 00:19:01 2017 +0000
tree 17ed34c68e58803fa28c5b9f16a223ab7f3635a5
parent a2b71a8ded7db6294817e65f6880998fd5b37a2c
parent 5c7544f9cd47021685618ccd76784d5a66e65389

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

Change-Id: I4fb910117150fecf4f61670be8d7ea1def235c61

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