ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit '5138958cb30266e718cd523905037e7e95373271':
  Enable property expansion for insmod
This commit is contained in:
Elliott Hughes 2015-05-05 01:10:19 +00:00 • committed by Android Git Automerger
commit 950c6250ad
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
init/builtins.cpp
View file

@ -58,7 +58,16 @@ extern "C" int init_module(void *, unsigned long, const char *);
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;
}