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

Merge "Revert "init: add ro.boot.init_rc""

Browse source 
am: 4c5c9db17b

Change-Id: I837b786637e5862cbad3338d053ce9b8c730241b
This commit is contained in:
Tao Bao 2017-01-17 20:25:29 +00:00 committed by android-build-merger
commit bd8a24e292
1 changed files with 3 additions and 10 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", "normal", },
{ "ro.boot.mode", "ro.bootmode", "unknown", },
{ "ro.boot.baseband", "ro.baseband", "unknown", },
{ "ro.boot.bootloader", "ro.bootloader", "unknown", },
{ "ro.boot.hardware", "ro.hardware", "unknown", },
@ -800,13 +800,7 @@ 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>());
std::string bootscript = property_get("ro.boot.init_rc");
if (bootscript.empty()) {
parser.ParseConfig("/init.rc");
} else {
parser.ParseConfig(bootscript);
}
parser.ParseConfig("/init.rc");
ActionManager& am = ActionManager::GetInstance();
@ -831,8 +825,7 @@ int main(int argc, char** argv) {
std::string bootmode = property_get("ro.bootmode");
if (bootmode == "charger") {
am.QueueEventTrigger("charger");
} else if (bootmode == "normal") {
// only trigger late-init in normal boot
} else {
am.QueueEventTrigger("late-init");
}