commit d815178b7512cb44d8b5f234e3f823b5a3e44dea
author Paul Lawrence <paullawrence@google.com> Wed Jul 01 14:40:56 2015 -0700
committer Paul Lawrence <paullawrence@google.com> Mon Jul 06 07:52:06 2015 -0700
tree 477d6a66a611502d90658a5ad83e589631eb0d90
parent d5a84845e6d75777de3cd35ecb23115bb740024c

Change init sequence to support file level encryption

File level encryption must get the key between mounting userdata and
calling post_fs_data when the directories are created. This requires
access to keymaster, which in turn is found from a system property.

Split property loaded into system and data, and load in right order.

Bug: 22233063
Change-Id: I8a6c40d44e17de386417a443c9dfc3b4e7fe59a5

init/init_parser.cpp

diff --git a/init/init_parser.cpp b/init/init_parser.cpp
index 666a86e..0f0c88e 100644
--- a/init/init_parser.cpp
+++ b/init/init_parser.cpp
@@ -159,7 +159,7 @@
     case 'l':
         if (!strcmp(s, "oglevel")) return K_loglevel;
         if (!strcmp(s, "oad_persist_props")) return K_load_persist_props;
-        if (!strcmp(s, "oad_all_props")) return K_load_all_props;
+        if (!strcmp(s, "oad_system_props")) return K_load_system_props;
         break;
     case 'm':
         if (!strcmp(s, "kdir")) return K_mkdir;