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

Commit d679e1b5 authored by Benoit Goby's avatar Benoit Goby
Browse files

init: Fix queue_all_property_triggers with nonexistent properties 

Don't queue actions for "on property=*" if the property does not exist.
This fixes these errors on boot:

    init: property 'sys.powerctl' doesn't exist while
    expanding '${sys.powerctl}'
    init: powerctl: cannot expand '${sys.powerctl}

Change-Id: I3bd354d73a860f856be5df2c654f940445f9efd9
parent 3c8bdef0

init/init_parser.c

+4 −2
Original line number Diff line number Diff line
@@ -549,12 +549,14 @@ void queue_all_property_triggers() 
                if (length > PROP_NAME_MAX) {

                    ERROR("property name too long in trigger %s", act->name);

                } else {

                    int ret;

                    memcpy(prop_name, name, length);

                    prop_name[length] = 0;



                    /* does the property exist, and match the trigger value? */

                    property_get(prop_name, value);

                    if (!strcmp(equals + 1, value) ||!strcmp(equals + 1, "*")) {

                    ret = property_get(prop_name, value);

                    if (ret > 0 && (!strcmp(equals + 1, value) ||

                                    !strcmp(equals + 1, "*"))) {

                        action_add_queue_tail(act);

                    }

                }