commit 0ef62fc46462f3025b0be27e75eb9e76af81b4be
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 19 00:10:18 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 19 00:10:18 2017 +0000
tree ba1bbcf09f6ad3fb38cd7da021e03e6f68f76a2f
parent 57f47c6be8b6f21b616e32906cbda1fe6e724cf1
parent 0ae97e4ef57359cc7827e5b026e82c40845df77c

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

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 027b392..20f1450 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1014,7 +1014,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