From 673eca8025162cbe220724b31f6201e350fc4cf2 Mon Sep 17 00:00:00 2001 From: Nullptr Date: Thu, 2 Feb 2023 22:21:27 +0800 Subject: [PATCH] Remove path suffix --- README.md | 31 +++++++++++++++++++++++-------- module/src/daemon.sh | 2 +- zygiskd/src/utils.rs | 2 +- zygiskd/src/zygisk.rs | 2 +- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 7c439d1e..a41cfa54 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,34 @@ # Zygisk on KernelSU -Zygisk loader for KernelSU, which allows Zygisk modules to run without Magisk environment. +Zygisk loader for KernelSU, allowing Zygisk modules to run without Magisk environment. + +Warning: The current version of Zygisksu is UNSTABLE. You may suffer boot loop or even data loss so use with caution. + +## Requirements + ++ Minimal KernelSU version: 15 ++ Minimal ksud version: 7b32c0e + +## Compatibility + +- [x] LSPosed +- [x] Storage Isolation +- [ ] IFW Enhance +- [ ] Universal SafetyNet Fix +- [ ] Shamiko ## Development road map -- [x] Basic Zygisk loader -- [x] Stabilize injector -- [ ] Separate zygiskd process -- [ ] Handle 64 bit only devices -- [ ] DenyList & Hide +- [x] [Inject] Basic Zygisk loader +- [x] [Inject] Stabilize injector +- [x] [Inject] Unload +- [ ] [Daemon] Separate zygiskd process +- [ ] [Daemon] Handle 64 bit only devices +- [ ] [Daemon] Handle zygote death ## Running on Magisk It is possible to run Zygisksu on Magisk with a few steps: -1. `mkdir -p /data/adb/ksu/bin` +1. `mkdir /data/adb/ksu` 2. `ln -s /data/adb/modules /data/adb/ksu/` -3. `cp $(which resetprop) /data/adb/ksu/bin/resetprop` diff --git a/module/src/daemon.sh b/module/src/daemon.sh index 6d1c094e..333ad36e 100644 --- a/module/src/daemon.sh +++ b/module/src/daemon.sh @@ -8,5 +8,5 @@ export NATIVE_BRIDGE=$(getprop ro.dalvik.vm.native.bridge) [ "$DEBUG" = true ] && export RUST_BACKTRACE=1 log -p i -t "zygisksu" "Start watchdog" -/data/adb/ksu/bin/resetprop ro.dalvik.vm.native.bridge libzygiskloader.so +resetprop ro.dalvik.vm.native.bridge libzygiskloader.so exec "$MODDIR/bin/zygiskwd" >/dev/null 2>&1 diff --git a/zygiskd/src/utils.rs b/zygiskd/src/utils.rs index 43ac3d49..574ef222 100644 --- a/zygiskd/src/utils.rs +++ b/zygiskd/src/utils.rs @@ -28,7 +28,7 @@ pub fn get_native_bridge() -> String { } pub fn restore_native_bridge() -> Result<()> { - Command::new("/data/adb/ksu/bin/resetprop") + Command::new("resetprop") .arg(constants::PROP_NATIVE_BRIDGE) .arg(get_native_bridge()) .spawn()?.wait()?; diff --git a/zygiskd/src/zygisk.rs b/zygiskd/src/zygisk.rs index e9780d0a..8e2d5c2c 100644 --- a/zygiskd/src/zygisk.rs +++ b/zygiskd/src/zygisk.rs @@ -182,7 +182,7 @@ fn create_daemon_socket(is64: bool) -> Result { fn handle_daemon_action(mut stream: UnixStream, context: &Context) -> Result<()> { let action = stream.read_u8()?; let action = DaemonSocketAction::try_from(action)?; - log::debug!("New daemon action {:?}", action); + log::trace!("New daemon action {:?}", action); match action { DaemonSocketAction::PingHeartbeat => { restore_native_bridge()?;