提交 695027e9 编写于 作者: Z zhong_ning

init configs compile

Signed-off-by: Nzhong_ning <zhong_ning@hoperun.com>
上级 03ba491f
......@@ -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",
]
}
}
{
"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",
......
......@@ -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
......
......@@ -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;
}
......
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册