tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "init: add ro.boot.init_rc" am: 0cf5e36c00

Browse source 
am: 1d1b981f95

Change-Id: If7afdc62ddea990a00713c548575c945a73022e4
This commit is contained in:
Hung-ying Tyan 2017-01-14 08:14:09 +00:00 committed by android-build-merger
commit a83586c1ed
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
init/init.cpp
View file

@ -409,7 +409,7 @@ static void export_kernel_boot_props() {
const char *default_value;
} prop_map[] = {
{ "ro.boot.serialno", "ro.serialno", "", },
{ "ro.boot.mode", "ro.bootmode", "unknown", },
{ "ro.boot.mode", "ro.bootmode", "normal", },
{ "ro.boot.baseband", "ro.baseband", "unknown", },
{ "ro.boot.bootloader", "ro.bootloader", "unknown", },
{ "ro.boot.hardware", "ro.hardware", "unknown", },
@ -800,7 +800,13 @@ int main(int argc, char** argv) {
parser.AddSectionParser("service",std::make_unique<ServiceParser>());
parser.AddSectionParser("on", std::make_unique<ActionParser>());
parser.AddSectionParser("import", std::make_unique<ImportParser>());
parser.ParseConfig("/init.rc");
std::string bootscript = property_get("ro.boot.init_rc");
if (bootscript.empty()) {
parser.ParseConfig("/init.rc");
} else {
parser.ParseConfig(bootscript);
}
ActionManager& am = ActionManager::GetInstance();
@ -825,7 +831,8 @@ int main(int argc, char** argv) {
std::string bootmode = property_get("ro.bootmode");
if (bootmode == "charger") {
am.QueueEventTrigger("charger");
} else {
} else if (bootmode == "normal") {
// only trigger late-init in normal boot
am.QueueEventTrigger("late-init");
}