android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

manager: use global mnt shell to aovid nsenter

Browse Source
This commit is contained in:
weishu
2024-02-23 18:14:21 +08:00
parent 0c52f24612
commit f855f8148a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt
View File

@@ -25,10 +25,13 @@ private fun getKsuDaemonPath(): String {
object KsuCli { object KsuCli {
val SHELL: Shell = createRootShell() val SHELL: Shell = createRootShell()
val GLOBAL_MNT_SHELL: Shell = createRootShell(true)
} }
fun getRootShell(): Shell { fun getRootShell(globalMnt: Boolean = false): Shell {
return KsuCli.SHELL return if (globalMnt) KsuCli.GLOBAL_MNT_SHELL else {
KsuCli.SHELL
}
} }
fun createRootShell(globalMnt: Boolean = false): Shell { fun createRootShell(globalMnt: Boolean = false): Shell {
@@ -156,8 +159,8 @@ fun overlayFsAvailable(): Boolean {
} }
fun hasMagisk(): Boolean { fun hasMagisk(): Boolean {
val shell = getRootShell() val shell = getRootShell(true)
val result = shell.newJob().add("nsenter --mount=/proc/1/ns/mnt which magisk").exec() val result = shell.newJob().add("which magisk").exec()
Log.i(TAG, "has magisk: ${result.isSuccess}") Log.i(TAG, "has magisk: ${result.isSuccess}")
return result.isSuccess return result.isSuccess
} }