Mirrors/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-05-29 13:00:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix several script issues

Browse Source
This commit is contained in:
topjohnwu 2017-07-31 23:31:40 +08:00
parent cb70eebb08
commit f79fad64aa
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jni/daemon/bootstages.c
View File

@ -161,7 +161,8 @@ void exec_module_script(const char* stage) {
char *module; char *module;
vec_for_each(&module_list, module) { vec_for_each(&module_list, module) {
snprintf(buf, PATH_MAX, "%s/%s/%s.sh", MOUNTPOINT, module, stage); snprintf(buf, PATH_MAX, "%s/%s/%s.sh", MOUNTPOINT, module, stage);
if (access(buf, F_OK) == -1) snprintf(buf2, PATH_MAX, "%s/%s/disable", MOUNTPOINT, module);
if (access(buf, F_OK) == -1 || access(buf2, F_OK) == 0)
continue; continue;
LOGI("%s: exec [%s.sh]\n", module, stage); LOGI("%s: exec [%s.sh]\n", module, stage);
char *const command[] = { "sh", buf, NULL }; char *const command[] = { "sh", buf, NULL };
@ -551,10 +552,6 @@ void post_fs_data(int client) {
xmkdir(COREDIR "/props", 0755); xmkdir(COREDIR "/props", 0755);
} }
// Run common scripts
LOGI("* Running post-fs-data.d scripts\n");
exec_common_script("post-fs-data");
// Core only mode // Core only mode
if (access(DISABLEFILE, F_OK) == 0) if (access(DISABLEFILE, F_OK) == 0)
goto core_only; goto core_only;
@ -702,6 +699,10 @@ void post_fs_data(int client) {
exec_module_script("post-fs-data"); exec_module_script("post-fs-data");
core_only: core_only:
// Run common scripts
LOGI("* Running post-fs-data.d scripts\n");
exec_common_script("post-fs-data");
// Systemless hosts // Systemless hosts
if (access(HOSTSFILE, F_OK) == 0) { if (access(HOSTSFILE, F_OK) == 0) {
LOGI("* Enabling systemless hosts file support"); LOGI("* Enabling systemless hosts file support");
@ -734,19 +735,18 @@ void late_start(int client) {
// Wait till the full patch is done // Wait till the full patch is done
pthread_join(sepol_patch, NULL); pthread_join(sepol_patch, NULL);
// Run scripts after full patch, most reliable way to run scripts
LOGI("* Running service.d scripts\n");
exec_common_script("service");
// Core only mode // Core only mode
if (access(DISABLEFILE, F_OK) == 0) { if (access(DISABLEFILE, F_OK) == 0)
setprop("ro.magisk.disable", "1"); goto core_only;
return;
}
LOGI("* Running module service scripts\n"); LOGI("* Running module service scripts\n");
exec_module_script("service"); exec_module_script("service");
core_only:
// Run scripts after full patch, most reliable way to run scripts
LOGI("* Running service.d scripts\n");
exec_common_script("service");
// Install Magisk Manager if exists // Install Magisk Manager if exists
if (access(MANAGERAPK, F_OK) == 0) { if (access(MANAGERAPK, F_OK) == 0) {
while (1) { while (1) {