commit 437bc5dceca1608456c1c40b694645bc2d100ad4
author Paul Lawrence <paullawrence@google.com> Tue Jul 07 17:05:58 2015 +0000
committer Paul Lawrence <paullawrence@google.com> Tue Jul 07 17:05:58 2015 +0000
tree b1c50ad382ddbd968b29d2b1e87a985569150859
parent d815178b7512cb44d8b5f234e3f823b5a3e44dea

Revert "Change init sequence to support file level encryption"

This reverts commit d815178b7512cb44d8b5f234e3f823b5a3e44dea.

Change-Id: I7e3f55d3092fcd04ea9f62f1971c9d42570f096c

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 64a363e..9e5f9ff 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -803,9 +803,9 @@
     return -1;
 }
 
-int do_load_system_props(int nargs, char **args) {
+int do_load_all_props(int nargs, char **args) {
     if (nargs == 1) {
-        load_system_props();
+        load_all_props();
         return 0;
     }
     return -1;