MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Create product mirror if /system/product exist

Browse Source
This commit is contained in:
topjohnwu 2019-09-23 06:52:24 -04:00
parent 4cd4bfa1d7
commit 695e7e6da0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
native/jni/core/bootstages.cpp
View File

@ -368,7 +368,7 @@ static bool magisk_env() {
parse_mnt("/proc/mounts", [&](mntent *me) { parse_mnt("/proc/mounts", [&](mntent *me) {
if (DIR_IS(system_root)) { if (DIR_IS(system_root)) {
mount_mirror(system_root, MS_RDONLY); mount_mirror(system_root, MS_RDONLY);
xsymlink(MIRRMNT(system_root) "/system", MIRRMNT(system)); xsymlink("./system_root/system", MIRRMNT(system));
VLOGI("link", MIRRMNT(system_root) "/system", MIRRMNT(system)); VLOGI("link", MIRRMNT(system_root) "/system", MIRRMNT(system));
system_as_root = true; system_as_root = true;
} else if (!system_as_root && DIR_IS(system)) { } else if (!system_as_root && DIR_IS(system)) {
@ -386,13 +386,17 @@ static bool magisk_env() {
}); });
if (access(MIRRMNT(system), F_OK) != 0 && access(MIRRMNT(system_root), F_OK) == 0) { if (access(MIRRMNT(system), F_OK) != 0 && access(MIRRMNT(system_root), F_OK) == 0) {
// Pre-init mirrors // Pre-init mirrors
xsymlink(MIRRMNT(system_root) "/system", MIRRMNT(system)); xsymlink("./system_root/system", MIRRMNT(system));
VLOGI("link", MIRRMNT(system_root) "/system", MIRRMNT(system)); VLOGI("link", MIRRMNT(system_root) "/system", MIRRMNT(system));
} }
if (access(MIRRMNT(vendor), F_OK) != 0) { if (access(MIRRMNT(vendor), F_OK) != 0) {
xsymlink(MIRRMNT(system) "/vendor", MIRRMNT(vendor)); xsymlink("./system/vendor", MIRRMNT(vendor));
VLOGI("link", MIRRMNT(system) "/vendor", MIRRMNT(vendor)); VLOGI("link", MIRRMNT(system) "/vendor", MIRRMNT(vendor));
} }
if (access("/system/product", F_OK) == 0 && access(MIRRMNT(product), F_OK) != 0) {
xsymlink("./system/product", MIRRMNT(product));
VLOGI("link", MIRRMNT(system) "/product", MIRRMNT(product));
}
// Disable/remove magiskhide, resetprop, and modules // Disable/remove magiskhide, resetprop, and modules
if (SDK_INT < 19) { if (SDK_INT < 19) {