提交: fe8a6e8e89a6708238bf4da60cad5ccd6c128f8c - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• 修訂: fe8a6e8e89a6708238bf4da60cad5ccd6c128f8c (tree)
• 時間: 2016-07-27 03:49:13
• 作者: Andrew Boie <andrew.p.boie@inte...>
• Commiter: Jaap Jan Meijer

Log Message

init: Add 'readprops' command

This reads the contents of a text file and sets system properties
based on its contents.

Change-Id: Ic03de7ee9afb8a12439d0dff343560011e152beb
For: AXIA-102
Signed-off-by: Andrew Boie <[e-mail]>

Change Summary

• modified: init/builtins.cpp
• modified: init/init_parser.cpp
• modified: init/keywords.h
• modified: init/property_service.cpp
• modified: init/property_service.h
• modified: init/readme.txt

差異

--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -675,6 +675,14 @@ int do_stop(int nargs, char **args)
     return 0;
 }
 
+int do_readprops(int nargs, char **args)
+{
+    if (nargs == 2) {
+        return load_properties_from_file(args[1], NULL);
+    }
+    return -1;
+}
+
 int do_restart(int nargs, char **args)
 {
     struct service *svc;

--- a/init/init_parser.cpp
+++ b/init/init_parser.cpp
@@ -177,6 +177,7 @@ static int lookup_keyword(const char *s)
         if (!strcmp(s, "robemod")) return K_probemod;
         break;
     case 'r':
+        if (!strcmp(s, "eadprops")) return K_readprops;
         if (!strcmp(s, "estart")) return K_restart;
         if (!strcmp(s, "estorecon")) return K_restorecon;
         if (!strcmp(s, "estorecon_recursive")) return K_restorecon_recursive;

--- a/init/keywords.h
+++ b/init/keywords.h
@@ -17,6 +17,7 @@ int do_mount_all(int nargs, char **args);
 int do_mount(int nargs, char **args);
 int do_powerctl(int nargs, char **args);
 int do_probemod(int nargs, char **args);
+int do_readprops(int nargs, char **args);
 int do_restart(int nargs, char **args);
 int do_restorecon(int nargs, char **args);
 int do_restorecon_recursive(int nargs, char **args);
@@ -81,6 +82,7 @@ enum {
     KEYWORD(on,          SECTION, 0, 0)
     KEYWORD(powerctl,    COMMAND, 1, do_powerctl)
     KEYWORD(probemod,    COMMAND, 1, do_probemod)
+    KEYWORD(readprops,   COMMAND, 1, do_readprops)
     KEYWORD(restart,     COMMAND, 1, do_restart)
     KEYWORD(restorecon,  COMMAND, 1, do_restorecon)
     KEYWORD(restorecon_recursive,  COMMAND, 1, do_restorecon_recursive)

--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -385,8 +385,6 @@ void get_property_workspace(int *fd, int *sz)
     *sz = pa_workspace.size;
 }
 
-static void load_properties_from_file(const char *, const char *);
-
 /*
  * Filter is used to decide which properties to load: NULL loads all keys,
  * "ro.foo.*" is a prefix match, and "ro.foo.bar" is an exact match.
@@ -451,14 +449,18 @@ static void load_properties(char *data, const char *filter)
  * Filter is used to decide which properties to load: NULL loads all keys,
  * "ro.foo.*" is a prefix match, and "ro.foo.bar" is an exact match.
  */
-static void load_properties_from_file(const char* filename, const char* filter) {
+int load_properties_from_file(const char* filename, const char* filter) {
     Timer t;
     std::string data;
     if (read_file(filename, &data)) {
         data.push_back('\n');
         load_properties(&data[0], filter);
+    } else {
+        ERROR("Unable to read property file '%s'\n", filename);
+        return -1;
     }
     NOTICE("(Loading properties from %s took %.2fs.)\n", filename, t.duration());
+    return 0;
 }
 
 static void load_persistent_properties() {

--- a/init/property_service.h
+++ b/init/property_service.h
@@ -22,6 +22,7 @@
 
 extern void property_init(void);
 extern void property_load_boot_defaults(void);
+extern int load_properties_from_file(const char *fn, const char *);
 extern void load_persist_props(void);
 extern void load_system_props(void);
 extern void start_property_service(void);

--- a/init/readme.txt
+++ b/init/readme.txt
@@ -238,6 +238,10 @@ powerctl
 restart <service>
    Like stop, but doesn't disable the service.
 
+readprops <path>
+   Read and set system properties based on the contents of a text file
+   at <path>
+
 restorecon <path> [ <path> ]*
    Restore the file named by <path> to the security context specified
    in the file_contexts configuration.