From 695027e9892cf030e09836208e09dcbffb98ba6f Mon Sep 17 00:00:00 2001
From: zhong_ning <zhong_ning@hoperun.com>
Date: Mon, 9 Aug 2021 16:26:35 +0800
Subject: [PATCH] init configs compile

Signed-off-by: zhong_ning <zhong_ning@hoperun.com>
---
 services/BUILD.gn                   | 15 +--------------
 services/etc/init.cfg               | 11 +++++------
 services/include/init_read_cfg.h    |  4 ----
 services/src/init_service_manager.c |  2 +-
 services/src/init_signal_handler.c  | 12 ++++++++++++
 5 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/services/BUILD.gn b/services/BUILD.gn
index cb4467b7b..5ba7cffa7 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -183,11 +183,6 @@ if (defined(ohos_lite)) {
     part_name = "init"
   }
 
-  ohos_prebuilt_etc("init.Hi3516DV300.cfg") {
-    source = "//device/hisilicon/hi3516dv300/build/rootfs/init.Hi3516DV300.cfg"
-    part_name = "init"
-  }
-
   ohos_prebuilt_etc("init.usb.cfg") {
     source = "//base/startup/init_lite/services/etc/init.usb.cfg"
     part_name = "init"
@@ -198,12 +193,6 @@ if (defined(ohos_lite)) {
     part_name = "init"
   }
 
-  ohos_prebuilt_etc("init.Hi3516DV300.usb.cfg") {
-    source =
-        "//device/hisilicon/hi3516dv300/build/rootfs/init.Hi3516DV300.usb.cfg"
-    part_name = "init"
-  }
-
   ohos_prebuilt_etc("ohos.para") {
     source = "//base/startup/init_lite/services/etc/ohos.para"
     part_name = "init"
@@ -212,13 +201,11 @@ if (defined(ohos_lite)) {
   group("init_etc") {
     deps = [
       ":group",
-      ":init.Hi3516DV300.cfg",
-      ":init.Hi3516DV300.usb.cfg",
       ":init.cfg",
       ":init.usb.cfg",
       ":init.usb.configfs.cfg",
-      ":passwd",
       ":ohos.para",
+      ":passwd",
     ]
   }
 }
diff --git a/services/etc/init.cfg b/services/etc/init.cfg
index 7774d27dc..080a5a3ae 100755
--- a/services/etc/init.cfg
+++ b/services/etc/init.cfg
@@ -1,11 +1,10 @@
 {
     "import" : [
-            "/init.environ.cfg",
-            "/init.usb.cfg",
-            "/init.usb.configfs.cfg",
-            "/init.usb.cfg",
-            "/init.Hi3516DV300.usb.cfg",
-            "/init.Hi3516DV300.cfg"
+            "/etc/init.usb.cfg",
+            "/etc/init.usb.configfs.cfg",
+            "/etc/init.usb.cfg",
+            "/etc/init.Hi3516DV300.usb.cfg",
+            "/etc/init.Hi3516DV300.cfg"
     ],
     "jobs" : [{
             "name" : "pre-init",
diff --git a/services/include/init_read_cfg.h b/services/include/init_read_cfg.h
index 3ab3a29ee..4cb57e130 100644
--- a/services/include/init_read_cfg.h
+++ b/services/include/init_read_cfg.h
@@ -21,11 +21,7 @@
 extern "C" {
 #endif
 #endif
-#ifndef OHOS_LITE
-#define INIT_CONFIGURATION_FILE "/init.cfg"
-#else
 #define INIT_CONFIGURATION_FILE "/etc/init.cfg"
-#endif
 #define  MAX_PATH_ARGS_CNT 20
 #define  MAX_ONE_ARG_LEN 200 // max length of one param/path
 
diff --git a/services/src/init_service_manager.c b/services/src/init_service_manager.c
index 265be6e70..8079fbe8c 100644
--- a/services/src/init_service_manager.c
+++ b/services/src/init_service_manager.c
@@ -665,7 +665,7 @@ void ParseAllServices(const cJSON* fileRoot)
     int servArrSize = 0;
     cJSON* serviceArr = GetArrItem(fileRoot, &servArrSize, SERVICES_ARR_NAME_IN_JSON);
     if (serviceArr == NULL) {
-        INIT_LOGE("ParseAllServices, get array %s failed.", SERVICES_ARR_NAME_IN_JSON);
+        INIT_LOGI("ParseAllServices, this config does not contain service array.");
         return;
     }
 
diff --git a/services/src/init_signal_handler.c b/services/src/init_signal_handler.c
index ffe8e55ea..d34373750 100644
--- a/services/src/init_signal_handler.c
+++ b/services/src/init_signal_handler.c
@@ -64,6 +64,18 @@ static void SigHandler(int sig)
                 if (sigPID <= 0) {
                     break;
                 }
+
+#ifndef OHOS_LITE
+                // check child process exit status
+                if (WIFSIGNALED(procStat)) {
+                    INIT_LOGE("Child process %d exit with signal: %d", sigPID, WTERMSIG(procStat));
+                }
+
+                if (WIFEXITED(procStat)) {
+                    INIT_LOGE("Child process %d exit with code : %d", sigPID, WEXITSTATUS(procStat));
+                }
+#endif
+
                 INIT_LOGI("SigHandler, SIGCHLD received, sigPID = %d.", sigPID);
 #ifdef __LINUX__
                 CheckWaitPid(sigPID);
-- 
Gitee