diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-07-01 14:40:56 -0700 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2015-07-06 07:52:06 -0700 |
| commit | d815178b7512cb44d8b5f234e3f823b5a3e44dea (patch) | |
| tree | 477d6a66a611502d90658a5ad83e589631eb0d90 /init/builtins.cpp | |
| parent | d5a84845e6d75777de3cd35ecb23115bb740024c (diff) | |
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
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 9e5f9ff89..64a363e98 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -803,9 +803,9 @@ int do_load_persist_props(int nargs, char **args) { return -1; } -int do_load_all_props(int nargs, char **args) { +int do_load_system_props(int nargs, char **args) { if (nargs == 1) { - load_all_props(); + load_system_props(); return 0; } return -1; |