diff options
| -rw-r--r-- | init/builtins.c | 11 | ||||
| -rw-r--r-- | init/init_parser.c | 1 | ||||
| -rw-r--r-- | init/keywords.h | 2 | ||||
| -rw-r--r-- | init/property_service.c | 12 | ||||
| -rw-r--r-- | init/property_service.h | 1 | ||||
| -rw-r--r-- | rootdir/init.rc | 3 |
6 files changed, 29 insertions, 1 deletions
diff --git a/init/builtins.c b/init/builtins.c index d9a9634e6..f2f76b7fe 100644 --- a/init/builtins.c +++ b/init/builtins.c @@ -286,7 +286,6 @@ int do_mount(int nargs, char **args) unsigned flags = 0; int n, i; int wait = 0; - char *prop; for (n = 4; n < nargs; n++) { for (i = 0; mount_flags[i].name; i++) { @@ -416,6 +415,8 @@ exit_success: * unencrypted, and also trigger the action for a nonencrypted system. */ if (!strcmp(target, DATA_MNT_POINT)) { + const char *prop; + prop = property_get("ro.crypto.state"); if (! prop) { prop = "notset"; @@ -631,6 +632,14 @@ int do_loglevel(int nargs, char **args) { return -1; } +int do_load_persist_props(int nargs, char **args) { + if (nargs == 1) { + load_persist_props(); + return 0; + } + return -1; +} + int do_wait(int nargs, char **args) { if (nargs == 2) { diff --git a/init/init_parser.c b/init/init_parser.c index 0898ae8aa..e8e65ac1a 100644 --- a/init/init_parser.c +++ b/init/init_parser.c @@ -113,6 +113,7 @@ int lookup_keyword(const char *s) break; case 'l': if (!strcmp(s, "oglevel")) return K_loglevel; + if (!strcmp(s, "oad_persist_props")) return K_load_persist_props; break; case 'm': if (!strcmp(s, "kdir")) return K_mkdir; diff --git a/init/keywords.h b/init/keywords.h index c977fd788..95acd01a3 100644 --- a/init/keywords.h +++ b/init/keywords.h @@ -30,6 +30,7 @@ int do_copy(int nargs, char **args); int do_chown(int nargs, char **args); 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_wait(int nargs, char **args); #define __MAKE_KEYWORD_ENUM__ #define KEYWORD(symbol, flags, nargs, func) K_##symbol, @@ -81,6 +82,7 @@ enum { KEYWORD(chown, COMMAND, 2, do_chown) KEYWORD(chmod, COMMAND, 2, do_chmod) KEYWORD(loglevel, COMMAND, 1, do_loglevel) + KEYWORD(load_persist_props, COMMAND, 0, do_load_persist_props) KEYWORD(ioprio, OPTION, 0, 0) #ifdef __MAKE_KEYWORD_ENUM__ KEYWORD_COUNT, diff --git a/init/property_service.c b/init/property_service.c index fdfec43db..be56a193f 100644 --- a/init/property_service.c +++ b/init/property_service.c @@ -515,6 +515,18 @@ int properties_inited(void) return property_area_inited; } +/* When booting an encrypted system, /data is not mounted when the + * property service is started, so any properties stored there are + * not loaded. Vold triggers init to load these properties once it + * has mounted /data. + */ +void load_persist_props(void) +{ + load_properties_from_file(PROP_PATH_LOCAL_OVERRIDE); + /* Read persistent properties after all default values have been loaded. */ + load_persistent_properties(); +} + void start_property_service(void) { int fd; diff --git a/init/property_service.h b/init/property_service.h index 045d20a5f..bc97cc42e 100644 --- a/init/property_service.h +++ b/init/property_service.h @@ -19,6 +19,7 @@ extern void handle_property_set_fd(void); extern void property_init(void); +extern void load_persist_props(void); extern void start_property_service(void); void get_property_workspace(int *fd, int *sz); extern const char* property_get(const char *name); diff --git a/rootdir/init.rc b/rootdir/init.rc index 046ab3ddc..ce000d6a2 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -304,6 +304,9 @@ on nonencrypted on property:vold.decrypt=trigger_reset_main class_reset main +on property:vold.decrypt=trigger_load_persist_props + load_persist_props + on property:vold.decrypt=trigger_post_fs_data trigger post-fs-data |