ueventd: source ueventd configs from vendor and odm
While keeping the old /ueventd.$ro.hardware.rc configuration for devices without early mount or vendor,odm split b/34967636 Test: Boot angler and sailfish without regressions Change-Id: I8d671911fd23fb1c0b5624ae209bad86137c88b7 Signed-off-by: Sandeep Patil <sspatil@google.com>
This commit is contained in:
parent
d85cf0fb7d
commit
bf298e6d0c
1 changed files with 11 additions and 2 deletions
|
|
@ -60,9 +60,18 @@ int ueventd_main(int argc, char **argv)
|
|||
cb.func_log = selinux_klog_callback;
|
||||
selinux_set_callback(SELINUX_CB_LOG, cb);
|
||||
|
||||
std::string hardware = property_get("ro.hardware");
|
||||
|
||||
ueventd_parse_config_file("/ueventd.rc");
|
||||
ueventd_parse_config_file("/vendor/ueventd.rc");
|
||||
ueventd_parse_config_file("/odm/ueventd.rc");
|
||||
|
||||
/*
|
||||
* keep the current product name base configuration so
|
||||
* we remain backwards compatible and allow it to override
|
||||
* everything
|
||||
* TODO: cleanup platform ueventd.rc to remove vendor specific
|
||||
* device node entries (b/34968103)
|
||||
*/
|
||||
std::string hardware = property_get("ro.hardware");
|
||||
ueventd_parse_config_file(android::base::StringPrintf("/ueventd.%s.rc", hardware.c_str()).c_str());
|
||||
|
||||
device_init();
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue