Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30cc3d72 authored by Emmanuel Berthier's avatar Emmanuel Berthier Committed by Elliott Hughes
Browse files

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: default avatarEmmanuel Berthier <emmanuel.berthier@intel.com>
(cherry picked from commit ac41230c)
parent 4fba2867

init/builtins.cpp

+10 −1
Original line number Diff line number Diff line
@@ -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;

    }