commit 74b6f94b2616011cbd81cee0f4c8c0a7ecad6f6c
author Tao Bao <tbao@google.com> Tue Jan 17 18:03:58 2017 +0000
committer gitbuildkicker <android-build@google.com> Tue Jan 17 13:49:32 2017 -0800
tree 69e24d131e438fc55546770c05e2c8b714e80ba8
parent b50e9fddda215b7fe2ab88c6f848c5e4ce43f0c5

Revert "init: add ro.boot.init_rc"

This reverts commit 7e6d30e5f20b56e3d585727068a891ce167788aa.

Bug: 26639863
Bug: 34318089
Change-Id: Ie71d773ee7c6c6a90e8298f8e0798eacba12d0be
(cherry picked from commit 01519a207cffb27517963d13ce9a021dacecdb45)

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 7f17a0c..ee5add8 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -409,7 +409,7 @@
         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 @@
     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 @@
     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");
     }