TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-08-11 15:17:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep /system/xbin/su on emulators

Browse Source
This commit is contained in:
topjohnwu
2025-08-08 17:16:17 -07:00
committed by John Wu
parent d11a3397d8
commit 6839cb9ab2
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
native/src/core/module.rs
View File

@@ -376,7 +376,7 @@ fn get_path_env() -> String {
.unwrap_or_default() .unwrap_or_default()
} }
fn inject_magisk_bins(system: &mut FsNode) { fn inject_magisk_bins(system: &mut FsNode, is_emulator: bool) {
fn inject(children: &mut FsNodeMap) { fn inject(children: &mut FsNodeMap) {
let mut path = cstr::buf::default().join_path(get_magisk_tmp()); let mut path = cstr::buf::default().join_path(get_magisk_tmp());
@@ -418,7 +418,7 @@ fn inject_magisk_bins(system: &mut FsNode) {
let mut candidates = vec![]; let mut candidates = vec![];
for orig_item in path_env.split(':') { for orig_item in path_env.split(':') {
// Filter not suitbale paths // Filter non-suitable paths
if !MAGISK_BIN_INJECT_PARTITIONS if !MAGISK_BIN_INJECT_PARTITIONS
.iter() .iter()
.any(|p| orig_item.starts_with(p.as_str())) .any(|p| orig_item.starts_with(p.as_str()))
@@ -430,6 +430,11 @@ fn inject_magisk_bins(system: &mut FsNode) {
continue; continue;
} }
// We want to keep /system/xbin/su on emulators (for debugging)
if is_emulator && orig_item.starts_with("/system/xbin") {
continue;
}
// Override existing su first // Override existing su first
let su_path = Utf8CString::from(format!("{orig_item}/su")); let su_path = Utf8CString::from(format!("{orig_item}/su"));
if su_path.exists() { if su_path.exists() {
@@ -555,7 +560,7 @@ fn inject_zygisk_bins(system: &mut FsNode) {
} }
} }
fn apply_modules(zygisk: bool, module_list: &[ModuleInfo]) { fn apply_modules(zygisk: bool, module_list: &[ModuleInfo], is_emulator: bool) {
let mut system = FsNode::new_dir(); let mut system = FsNode::new_dir();
// Build all the base "prefix" paths // Build all the base "prefix" paths
@@ -620,7 +625,7 @@ fn apply_modules(zygisk: bool, module_list: &[ModuleInfo]) {
// step, treating Magisk just like a special "module". // step, treating Magisk just like a special "module".
if get_magisk_tmp() != "/sbin" || get_path_env().split(":").all(|s| s != "/sbin") { if get_magisk_tmp() != "/sbin" || get_path_env().split(":").all(|s| s != "/sbin") {
inject_magisk_bins(&mut system); inject_magisk_bins(&mut system, is_emulator);
} }
if zygisk { if zygisk {
inject_zygisk_bins(&mut system); inject_zygisk_bins(&mut system);
@@ -875,7 +880,7 @@ impl MagiskD {
if zygisk { if zygisk {
set_zygisk_prop(); set_zygisk_prop();
} }
apply_modules(zygisk, &modules); apply_modules(zygisk, &modules, self.is_emulator);
self.module_list.set(modules).ok(); self.module_list.set(modules).ok();
} }