TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-27 20:15:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip overlayfs for post-fs-data mount

Browse Source 
adb remount will introduce overlayfs for /system and /vendor, we should
skip mounting as overlayfs. This also helps us support overlayfs Magisk
later.
This commit is contained in:
LoveSy 2022-01-01 07:58:57 +08:00 committed by John Wu
parent 21d7db0959
commit c38b826abf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ bool zygisk_enabled = false;
} }
#define mount_mirror(part, flag) \ #define mount_mirror(part, flag) \
else if (MNT_DIR_IS("/" #part) && me->mnt_type != "tmpfs"sv && lstat(me->mnt_dir, &st) == 0) \ else if (MNT_DIR_IS("/" #part) && me->mnt_type != "tmpfs"sv && me->mnt_type != "overlay"sv && lstat(me->mnt_dir, &st) == 0) \
do_mount_mirror(part, flag) do_mount_mirror(part, flag)
#define link_mirror(part) \ #define link_mirror(part) \
@ -50,7 +50,7 @@ if (access("/system/" #part, F_OK) == 0 && access(buf1, F_OK) != 0) { \
} }
#define link_orig_dir(dir, part) \ #define link_orig_dir(dir, part) \
else if (MNT_DIR_IS(dir) && me->mnt_type != "tmpfs"sv) { \ else if (MNT_DIR_IS(dir) && me->mnt_type != "tmpfs"sv && me->mnt_type != "overlay"sv) { \
SETMIR(buf1, part); \ SETMIR(buf1, part); \
rmdir(buf1); \ rmdir(buf1); \
xsymlink(dir, buf1); \ xsymlink(dir, buf1); \