diff --git a/services/BUILD.gn b/services/BUILD.gn index cb4467b7b1bff7d80e9b54559b1b65b113e6342a..5ba7cffa73de640d6d59685a3a9c801fdf0b20d5 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 7774d27dcbc1f5cbad2024c05d63a4a2f1dfee86..080a5a3aebe002ec546f4319038c61d43170293e 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 3ab3a29ee123f74154b89c164dec89f2d7c44ad4..4cb57e130f98b570e9bb792492d3026ad04b1f93 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 265be6e70ff05d131880c8679ce2c3f8fab1e2b7..8079fbe8cb7c529689003a245e9d2d720eba9e41 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 ffe8e55eaa08bc24b00ed988778e215d078ec9b9..d34373750f1d44d8131f7013d3ba8a588fb2abf1 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);