gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2026-01-16 23:02:23 -08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Cancel recursive bind"

Browse Source 
This reverts commit a18a440236.
This commit is contained in:
topjohnwu
2023-04-05 10:47:13 -07:00
parent 18b1ef6c29
commit cc5ff36165
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
native/src/init/rootdir.cpp
View File

@@ -233,8 +233,9 @@ void MagiskInit::patch_ro_root() {
setup_tmp(tmp_dir.data());
chdir(tmp_dir.data());
// Recreate original sbin structure if necessary
if (tmp_dir == "/sbin") {
// Recreate original sbin structure
// Mount system_root mirror
xmkdir(ROOTMIR, 0755);
xmount("/", ROOTMIR, nullptr, MS_BIND, nullptr);
recreate_sbin(ROOTMIR "/sbin", true);
@@ -279,8 +280,7 @@ void MagiskInit::patch_ro_root() {
// Oculus Go will use a special sepolicy if unlocked
if (access("/sepolicy.unlocked", F_OK) == 0) {
patch_sepolicy("/sepolicy.unlocked", ROOTOVL "/sepolicy.unlocked");
} else if ((access(SPLIT_PLAT_CIL, F_OK) != 0 && access("/sepolicy", F_OK) == 0) ||
!hijack_sepolicy()) {
} else if ((access(SPLIT_PLAT_CIL, F_OK) != 0 && access("/sepolicy", F_OK) == 0) || !hijack_sepolicy()) {
patch_sepolicy("/sepolicy", ROOTOVL "/sepolicy");
}