!3328 关机充电模式下不加载init.cfg

Merge pull request !3328 from cat/charge
This commit is contained in:
openharmony_ci 2024-11-02 03:42:41 +00:00 committed by Gitee
commit 457a26cff2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 3 additions and 4 deletions

View File

@ -173,9 +173,9 @@
"chown root system /dev/fscklogs/log",
"chmod 0770 /dev/fscklogs/log",
"chmod 0660 /dev/fuse",
"restorecon /data/service/el1/public",
"restorecon /data/service/el1/public/activation_lock",
"restorecon /data/service/el1/startup/parameters"
"restorecon -F /data/service/el1/public",
"restorecon -F /data/service/el1/public/activation_lock",
"restorecon -F /data/service/el1/startup/parameters"
]
}, {
"name" : "boot",

View File

@ -112,7 +112,6 @@ void ReadConfig(void)
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 (InRescueMode() == 0) {
ParseInitCfg(INIT_CONFIGURATION_FILE, NULL);