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

Cancel recursive bind

Browse Source
This commit is contained in:
vvb2060
2023-04-07 01:54:40 +08:00
committed by John Wu
parent 9f7d410959
commit ee50da566f
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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