commit cd953787a8194691131757a4f57591b9dbfd1670
author Emmanuel Berthier <emmanuel.berthier@intel.com> Mon Apr 27 13:50:09 2015 +0200
committer Elliott Hughes <enh@google.com> Tue May 12 15:01:02 2015 -0700
tree 40ce415f4fde96feea4aa55589a8afa8029d2c14
parent 8267fec60c7f7ecab4f7bf9b1bbde5fcf11fa4d3

Enable property expansion for insmod

Useful for dynamic kernel module location.
This permits to use init rule like:

  insmod ${persist.modules.location}/<module_name>

Change-Id: If7479bdcb4e69ea7666f52a0075c785be025c2e9
Signed-off-by: Emmanuel Berthier <emmanuel.berthier@intel.com>
(cherry picked from commit ac41230cbc10bae95a049282238adb03605579c2)

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 4567b04..f59d1fe 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -58,7 +58,16 @@
 static int insmod(const char *filename, char *options)
 {
     std::string module;
-    if (!read_file(filename, &module)) {
+    char filename_val[PROP_VALUE_MAX];
+    int ret;
+
+    ret = expand_props(filename_val, filename, sizeof(filename_val));
+    if (ret) {
+        ERROR("insmod: cannot expand '%s'\n", filename);
+        return -EINVAL;
+    }
+
+    if (!read_file(filename_val, &module)) {
         return -1;
     }