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/keywords.h

diff --git a/init/keywords.h b/init/keywords.h
index ddaaffb..e637d7d 100644
--- a/init/keywords.h
+++ b/init/keywords.h
@@ -34,7 +34,7 @@
 int do_chmod(int nargs, char **args);
 int do_loglevel(int nargs, char **args);
 int do_load_persist_props(int nargs, char **args);
-int do_load_system_props(int nargs, char **args);
+int do_load_all_props(int nargs, char **args);
 int do_verity_load_state(int nargs, char **args);
 int do_verity_update_state(int nargs, char **args);
 int do_wait(int nargs, char **args);
@@ -66,7 +66,7 @@
     KEYWORD(installkey,  COMMAND, 1, do_installkey)
     KEYWORD(ioprio,      OPTION,  0, 0)
     KEYWORD(keycodes,    OPTION,  0, 0)
-    KEYWORD(load_system_props,     COMMAND, 0, do_load_system_props)
+    KEYWORD(load_all_props,        COMMAND, 0, do_load_all_props)
     KEYWORD(load_persist_props,    COMMAND, 0, do_load_persist_props)
     KEYWORD(loglevel,    COMMAND, 1, do_loglevel)
     KEYWORD(mkdir,       COMMAND, 1, do_mkdir)