!1357 南向适配，归一化一级二级启动

Merge pull request !1357 from cheng_jinsong/normalize_startup

services/etc/BUILD.gn

@@ -60,6 +60,7 @@ if (defined(ohos_lite)) {
     } else {
       source = "//base/startup/init/services/etc/init.cfg"
     }
+    output = "init.cfg"
     part_name = "init"
     subsystem_name = "startup"
   }

services/init/include/init_jobs_internal.h

@@ -38,11 +38,7 @@ void DumpAllJobs(void);
 
 int DoJobNow(const char *jobName);
 
-#ifndef DISABLE_INIT_TWO_STAGES
 #define INIT_CONFIGURATION_FILE "/etc/init.cfg"
-#else
-#define INIT_CONFIGURATION_FILE "/etc/init.without_two_stages.cfg"
-#endif
 #define OTHER_CFG_PATH "/system/etc/init"
 #define OTHER_CHARGE_PATH "/vendor/etc/charger"
 #define MAX_PATH_ARGS_CNT 20

services/init/standard/BUILD.gn

@@ -123,9 +123,6 @@ ohos_executable("init") {
     defines += [ "SUPPORT_64BIT" ]
   }
 
-  if (!enable_ramdisk) {
-    defines += [ "DISABLE_INIT_TWO_STAGES" ]
-  }
   if (defined(global_parts_info.developtools_profiler)) {
     defines += [ "SUPPORT_PROFILER_HIDEBUG" ]
     external_deps = [ "profiler:libhidebug_init" ]

services/init/standard/init.c

@@ -206,7 +206,6 @@ static void StartInitSecondStage(void)
     // It will panic if close stdio before execv("/bin/sh", NULL)
     CloseStdio();
 
-#ifndef DISABLE_INIT_TWO_STAGES
     INIT_LOGI("Start init second stage.");
     SwitchRoot("/usr");
     // Execute init second stage
@@ -219,7 +218,6 @@ static void StartInitSecondStage(void)
         INIT_LOGE("Failed to exec \"/bin/init\", err = %d", errno);
         exit(-1);
     }
-#endif
 }
 
 void SystemPrepare(void)