diff --git a/services/init/init_config.c b/services/init/init_config.c index 59c3a21091830cfe38fec994537a6f92d3aa3597..9135a1f143da3a0d688c7f97811ff02c1b15449f 100644 --- a/services/init/init_config.c +++ b/services/init/init_config.c @@ -102,24 +102,31 @@ static void ParseAllImports(const cJSON *root) void ReadConfig(void) { - // parse cfg + // // parse cfg + // char buffer[32] = {0}; // 32 reason max leb + // uint32_t len = sizeof(buffer); + // SystemReadParam("ohos.boot.mode", buffer, &len); + // INIT_LOGI("ohos.boot.mode %s", buffer); + // if (strcmp(buffer, "charger_mode") == 0) { + // ParseInitCfg(INIT_CONFIGURATION_FILE, NULL); + // ReadFileInDir(OTHER_CHARGE_PATH, ".cfg", ParseInitCfg, NULL); + // ParseInitCfgByPriority(); + // } else if (strcmp(buffer, "charger") == 0) { + // ParseInitCfg(INIT_CONFIGURATION_FILE, NULL); + // ReadFileInDir(OTHER_CHARGE_PATH, ".cfg", ParseInitCfg, NULL); + // } else if (InUpdaterMode() == 0) { + // ParseInitCfg(INIT_CONFIGURATION_FILE, NULL); + // ParseInitCfgByPriority(); + // } else { + // ReadFileInDir("/etc", ".cfg", ParseInitCfg, NULL); + // } + + char buffer[32] = {0}; // 32 reason max leb uint32_t len = sizeof(buffer); SystemReadParam("ohos.boot.mode", buffer, &len); INIT_LOGI("ohos.boot.mode %s", buffer); - if ((strcmp(buffer, "charger_mode") == 0) || (GetBootModeFromMisc() == GROUP_CHARGE)) { - ParseInitCfg(INIT_CONFIGURATION_FILE, NULL); - ReadFileInDir(OTHER_CHARGE_PATH, ".cfg", ParseInitCfg, NULL); - ParseInitCfgByPriority(); - } else if (strcmp(buffer, "charger") == 0) { - ReadFileInDir(OTHER_CHARGE_PATH, ".cfg", ParseInitCfg, NULL); - } else if (InRescueMode() == 0) { - ParseInitCfg(INIT_CONFIGURATION_FILE, NULL); - ReadFileInDir(INIT_RESCUE_MODE_PATH, ".cfg", ParseInitCfg, NULL); - } else if (InUpdaterMode() == 0) { - ParseInitCfg(INIT_CONFIGURATION_FILE, NULL); - ParseInitCfgByPriority(); - } else { - ReadFileInDir("/etc", ".cfg", ParseInitCfg, NULL); - } + ParseInitCfg(INIT_CONFIGURATION_FILE, NULL); + ReadFileInDir(OTHER_CHARGE_PATH, ".cfg", ParseInitCfg, NULL); + ParseInitCfgByPriority(); }