br0kenpixel/ReZygisk
1
0
Fork 0
mirror of https://github.com/PerformanC/ReZygisk.git synced 2025-09-06 06:37:01 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

update: module id

Browse Source 
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
This commit is contained in:
ThePedroo
2025-05-18 20:06:06 -03:00
parent ed347e879e
commit 98f88916b8
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -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)

6
loader/src/ptracer/monitor.c
View File

@@ -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");

2
webroot/js/language.js
View File

@@ -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)

6
webroot/js/monitorActions.js
View File

@@ -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')
})
}
})()

6
zygiskd/src/zygiskd.c
View File

@@ -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];