commit b8dc4a56ea81c3435e4cb77e451b5fc79ced959e
author Elliott Hughes <enh@google.com> Tue May 05 01:10:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 05 01:10:19 2015 +0000
tree 943dd01cf8f6e2eacfd9254a33ac5692dc83dec0
parent c4d043e86bb9314c47f9cee856ae6395c20f8d7e
parent e2653e96929e1cd8560cfe7ce5bdaf6c76d72317

am 5138958c: Merge "Enable property expansion for insmod"

* commit '5138958cb30266e718cd523905037e7e95373271':
  Enable property expansion for insmod

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index d772383..88d6165 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;
     }