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

Change module dir and bump to 0.6.1

Browse Source
This commit is contained in:
Nullptr
2023-03-01 12:29:38 +08:00
parent 2e9cbf79a7
commit 446ed92f26
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -13,7 +13,7 @@ Also works as standalone loader for Magisk on purpose of getting rid of LD_PRELO
### KernelSU ### KernelSU
+ Minimal KernelSU version: 10654 + Minimal KernelSU version: 10654
+ Minimal ksud version: 10647 + Minimal ksud version: 10670
+ Kernel has full SELinux patch support + Kernel has full SELinux patch support
+ For old kernels, you may need to manually add the following code to `sepolicy.rule`: + For old kernels, you may need to manually add the following code to `sepolicy.rule`:
`allow zygote appdomain_tmpfs file *` `allow zygote appdomain_tmpfs file *`

4
build.gradle.kts
View File

@@ -31,10 +31,10 @@ val gitCommitHash = "git rev-parse --verify --short HEAD".execute()
val moduleId by extra("zygisksu") val moduleId by extra("zygisksu")
val moduleName by extra("Zygisk on KernelSU") val moduleName by extra("Zygisk on KernelSU")
val verName by extra("v4-0.6.0") val verName by extra("v4-0.6.1")
val verCode by extra(gitCommitCount) val verCode by extra(gitCommitCount)
val minKsuVersion by extra(10654) val minKsuVersion by extra(10654)
val minKsudVersion by extra(10647) val minKsudVersion by extra(10670)
val maxKsuVersion by extra(20000) val maxKsuVersion by extra(20000)
val minMagiskVersion by extra(25208) val minMagiskVersion by extra(25208)

11
loader/src/injector/unmount.cpp
View File

@@ -9,7 +9,7 @@
using namespace std::string_view_literals; using namespace std::string_view_literals;
namespace { namespace {
constexpr auto KSU_MODULE_DIR = "/data/adb/ksu/modules"; constexpr auto MODULE_DIR = "/data/adb/modules";
struct overlay_backup { struct overlay_backup {
std::string target; std::string target;
@@ -38,10 +38,10 @@ void revert_unmount_ksu() {
std::list<overlay_backup> backups; std::list<overlay_backup> backups;
// Unmount ksu module dir last // Unmount ksu module dir last
targets.emplace_back(KSU_MODULE_DIR); targets.emplace_back(MODULE_DIR);
for (auto& info: parse_mount_info("self")) { for (auto& info: parse_mount_info("self")) {
if (info.target == KSU_MODULE_DIR) { if (info.target == MODULE_DIR) {
ksu_loop = info.source; ksu_loop = info.source;
continue; continue;
} }
@@ -51,8 +51,7 @@ void revert_unmount_ksu() {
} }
// Unmount ksu overlays // Unmount ksu overlays
if (info.type == "overlay") { if (info.type == "overlay") {
LOGV("Overlay: %s (%s)", info.target.data(), info.fs_option.data()); if (str_contains(info.fs_option, MODULE_DIR)) {
if (str_contains(info.fs_option, KSU_MODULE_DIR)) {
targets.emplace_back(info.target); targets.emplace_back(info.target);
} else { } else {
auto backup = overlay_backup{ auto backup = overlay_backup{
@@ -66,7 +65,7 @@ void revert_unmount_ksu() {
} }
for (auto& info: parse_mount_info("self")) { for (auto& info: parse_mount_info("self")) {
// Unmount everything from ksu loop except ksu module dir // Unmount everything from ksu loop except ksu module dir
if (info.source == ksu_loop && info.target != KSU_MODULE_DIR) { if (info.source == ksu_loop && info.target != MODULE_DIR) {
targets.emplace_back(info.target); targets.emplace_back(info.target);
} }
} }

2
module/src/post-fs-data.sh
View File

@@ -9,7 +9,7 @@ cd "$MODDIR"
getprop ro.dalvik.vm.native.bridge > /dev/.native_bridge getprop ro.dalvik.vm.native.bridge > /dev/.native_bridge
resetprop ro.dalvik.vm.native.bridge libzygisk_loader.so resetprop ro.dalvik.vm.native.bridge libzygisk_loader.so
if [ "$(which magisk)" ] && [ ".." -ef "/data/adb/modules" ]; then if [ "$(which magisk)" ]; then
for file in ../*; do for file in ../*; do
if [ -d "$file" ] && [ -d "$file/zygisk" ] && ! [ -f "$file/disable" ]; then if [ -d "$file" ] && [ -d "$file/zygisk" ] && ! [ -f "$file/disable" ]; then
if [ -f "$file/post-fs-data.sh" ]; then if [ -f "$file/post-fs-data.sh" ]; then

2
module/src/service.sh
View File

@@ -11,7 +11,7 @@ cd "$MODDIR"
export NATIVE_BRIDGE=$(cat /dev/.native_bridge) export NATIVE_BRIDGE=$(cat /dev/.native_bridge)
rm /dev/.native_bridge rm /dev/.native_bridge
if [ "$(which magisk)" ] && [ ".." -ef "/data/adb/modules" ]; then if [ "$(which magisk)" ]; then
for file in ../*; do for file in ../*; do
if [ -d "$file" ] && [ -d "$file/zygisk" ] && ! [ -f "$file/disable" ]; then if [ -d "$file" ] && [ -d "$file/zygisk" ] && ! [ -f "$file/disable" ]; then
if [ -f "$file/service.sh" ]; then if [ -f "$file/service.sh" ]; then