From 98f88916b80f95aa2cc3bc808c255618f0d432cf Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Sun, 18 May 2025 20:06:06 -0300 Subject: [PATCH] update: module id Historically "zygisksu" is the ZygiskOnKernelSU (known as Zygisk Next) module id, which due to ReZygisk being a fork of Zygisk Next, was used by it. To avoid conflicts in systems like MMRL, we decided to change it to "rezygisk". This, however, will allow both to be installed in the same system, although causing problems, as a side effect. The old module, with the old module id, must be uninstalled while the new one is installed. closes #113 --- build.gradle.kts | 2 +- loader/src/ptracer/monitor.c | 6 +++--- webroot/js/language.js | 2 +- webroot/js/monitorActions.js | 6 +++--- zygiskd/src/zygiskd.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fd2df21..7699231 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ fun String.execute(currentWorkingDir: File = file("./")): String { val gitCommitCount = "git rev-list HEAD --count".execute().toInt() val gitCommitHash = "git rev-parse --verify --short HEAD".execute() -val moduleId by extra("zygisksu") +val moduleId by extra("rezygisk") val moduleName by extra("ReZygisk") val verName by extra("v1.0.0") val verCode by extra(gitCommitCount) diff --git a/loader/src/ptracer/monitor.c b/loader/src/ptracer/monitor.c index e6e8f8d..22048dd 100644 --- a/loader/src/ptracer/monitor.c +++ b/loader/src/ptracer/monitor.c @@ -355,7 +355,7 @@ void rezygiskd_listener_callback() { case SYSTEM_SERVER_STARTED: { LOGD("system server started, mounting prop"); - if (mount(PROP_PATH, "/data/adb/modules/zygisksu/module.prop", NULL, MS_BIND, NULL) == -1) { + if (mount(PROP_PATH, "/data/adb/modules/rezygisk/module.prop", NULL, MS_BIND, NULL) == -1) { PLOGE("failed to mount prop"); } @@ -405,7 +405,7 @@ static bool ensure_daemon_created(bool is_64bit) { if (is_64bit || (!is_64bit && !status64.supported)) { LOGD("new zygote started."); - umount2("/data/adb/modules/zygisksu/module.prop", MNT_DETACH); + umount2("/data/adb/modules/rezygisk/module.prop", MNT_DETACH); } if (status->daemon_pid != -1) { @@ -800,7 +800,7 @@ static bool prepare_environment() { /* INFO: We need to create the file first, otherwise the mount will fail */ close(open(PROP_PATH, O_WRONLY | O_CREAT | O_TRUNC, 0644)); - FILE *orig_prop = fopen("/data/adb/modules/zygisksu/module.prop", "r"); + FILE *orig_prop = fopen("/data/adb/modules/rezygisk/module.prop", "r"); if (orig_prop == NULL) { PLOGE("failed to open orig prop"); diff --git a/webroot/js/language.js b/webroot/js/language.js index 8ccf798..bcbb843 100644 --- a/webroot/js/language.js +++ b/webroot/js/language.js @@ -49,7 +49,7 @@ export async function getTranslations(locate) { } export async function getAvailableLanguages() { - const lsCmd = await exec('ls /data/adb/modules/zygisksu/webroot/lang') + const lsCmd = await exec('ls /data/adb/modules/rezygisk/webroot/lang') if (lsCmd.errno !== 0) return setError('WebUI', lsCmd.stderr) diff --git a/webroot/js/monitorActions.js b/webroot/js/monitorActions.js index 4fd76d3..e12ec15 100644 --- a/webroot/js/monitorActions.js +++ b/webroot/js/monitorActions.js @@ -18,13 +18,13 @@ const monitor_status = document.getElementById('monitor_status'); monitor_status.innerHTML = translations.page.actions.status.tracing - exec('/data/adb/modules/zygisksu/bin/zygisk-ptrace64 ctl start') + exec('/data/adb/modules/rezygisk/bin/zygisk-ptrace64 ctl start') }) monitor_stop.addEventListener('click', () => { monitor_status.innerHTML = translations.page.actions.status.exiting - exec('/data/adb/modules/zygisksu/bin/zygisk-ptrace64 ctl exit') + exec('/data/adb/modules/rezygisk/bin/zygisk-ptrace64 ctl exit') }) monitor_pause.addEventListener('click', () => { @@ -32,7 +32,7 @@ const monitor_status = document.getElementById('monitor_status'); monitor_status.innerHTML = translations.page.actions.status.stopped - exec('/data/adb/modules/zygisksu/bin/zygisk-ptrace64 ctl stop') + exec('/data/adb/modules/rezygisk/bin/zygisk-ptrace64 ctl stop') }) } })() \ No newline at end of file diff --git a/zygiskd/src/zygiskd.c b/zygiskd/src/zygiskd.c index 918b278..99ee1eb 100644 --- a/zygiskd/src/zygiskd.c +++ b/zygiskd/src/zygiskd.c @@ -44,8 +44,8 @@ enum Architecture { #define TMP_PATH "/data/adb/rezygisk" #define CONTROLLER_SOCKET TMP_PATH "/init_monitor" #define PATH_CP_NAME TMP_PATH "/" lp_select("cp32.sock", "cp64.sock") -#define ZYGISKD_FILE PATH_MODULES_DIR "/zygisksu/bin/zygiskd" lp_select("32", "64") -#define ZYGISKD_PATH "/data/adb/modules/zygisksu/bin/zygiskd" lp_select("32", "64") +#define ZYGISKD_FILE PATH_MODULES_DIR "/rezygisk/bin/zygiskd" lp_select("32", "64") +#define ZYGISKD_PATH "/data/adb/modules/rezygisk/bin/zygiskd" lp_select("32", "64") static enum Architecture get_arch(void) { char system_arch[32]; @@ -83,7 +83,7 @@ static void load_modules(enum Architecture arch, struct Context *restrict contex struct dirent *entry; while ((entry = readdir(dir)) != NULL) { if (entry->d_type != DT_DIR) continue; /* INFO: Only directories */ - if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0 || strcmp(entry->d_name, "zygisksu") == 0) continue; + if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0 || strcmp(entry->d_name, "rezygisk") == 0) continue; char *name = entry->d_name; char so_path[PATH_MAX];