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

Revert "Cancel recursive bind"

Browse Source 
This reverts commit a18a440236e6b1563cd9ceb1abee21836d5cebd8.
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
native/src/init/mount.cpp
View File

@ -121,7 +121,7 @@ static void switch_root(const string &path) {
#define PREINITMNT MIRRDIR "/preinit" #define PREINITMNT MIRRDIR "/preinit"
static void mount_preinit_dir(string preinit_dev) { static void mount_preinit_dir(string path, string preinit_dev) {
if (preinit_dev.empty()) return; if (preinit_dev.empty()) return;
strcpy(blk_info.partname, preinit_dev.data()); strcpy(blk_info.partname, preinit_dev.data());
strcpy(blk_info.block_dev, PREINITDEV); strcpy(blk_info.block_dev, PREINITDEV);
@ -156,6 +156,7 @@ static void mount_preinit_dir(string preinit_dev) {
} else { } else {
LOGD("preinit: %s\n", preinit_dir.data()); LOGD("preinit: %s\n", preinit_dir.data());
xmount(preinit_dir.data(), PREINITMIRR, nullptr, MS_BIND, nullptr); xmount(preinit_dir.data(), PREINITMIRR, nullptr, MS_BIND, nullptr);
mount_list.emplace_back(path += "/" PREINITMIRR);
} }
xumount2(PREINITMNT, MNT_DETACH); xumount2(PREINITMNT, MNT_DETACH);
} else { } else {
@ -264,7 +265,7 @@ void MagiskInit::setup_tmp(const char *path) {
xmkdir(BLOCKDIR, 0); xmkdir(BLOCKDIR, 0);
xmkdir(WORKERDIR, 0); xmkdir(WORKERDIR, 0);
mount_preinit_dir(preinit_dev); mount_preinit_dir(path, preinit_dev);
cp_afc(".backup/.magisk", INTLROOT "/config"); cp_afc(".backup/.magisk", INTLROOT "/config");
rm_rf(".backup"); rm_rf(".backup");
@ -274,7 +275,7 @@ void MagiskInit::setup_tmp(const char *path) {
xsymlink("./magisk", applet_names[i]); xsymlink("./magisk", applet_names[i]);
xsymlink("./magiskpolicy", "supolicy"); xsymlink("./magiskpolicy", "supolicy");
xmount(".", path, nullptr, MS_BIND, nullptr); xmount(".", path, nullptr, MS_BIND | MS_REC, nullptr);
chdir("/"); chdir("/");
} }

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

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