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

Avoid F2FS like a plague

Browse Source
This commit is contained in:
topjohnwu 2021-01-15 02:23:53 -08:00
parent 71b083794c
commit 51bc27a869
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
native/jni/init/mount.cpp
View File

@ -228,9 +228,9 @@ void MagiskInit::mount_rules_dir(const char *dev_base, const char *mnt_base) {
if (setup_block(false) < 0) if (setup_block(false) < 0)
goto cache; goto cache;
} }
// Try to mount with either ext4 or f2fs // WARNING: DO NOT ATTEMPT TO MOUNT F2FS AS IT MAY CRASH THE KERNEL
// Failure means either FDE or metadata encryption // Failure means either f2fs, FDE, or metadata encryption
if (!do_mount("ext4") && !do_mount("f2fs")) if (!do_mount("ext4"))
goto cache; goto cache;
strcpy(p, "/data/unencrypted"); strcpy(p, "/data/unencrypted");

2
scripts/util_functions.sh
View File

@ -608,7 +608,7 @@ copy_sepolicy_rules() {
local active_dir=$(magisk --path)/.magisk/mirror/sepolicy.rules local active_dir=$(magisk --path)/.magisk/mirror/sepolicy.rules
if [ -e $active_dir ]; then if [ -e $active_dir ]; then
RULESDIR=$(readlink -f $active_dir) RULESDIR=$(readlink -f $active_dir)
elif [ -d /data/unencrypted ] && ! grep ' /data ' /proc/mounts | grep -q 'dm-'; then elif [ -d /data/unencrypted ] && ! grep ' /data ' /proc/mounts | grep -qE 'dm-|f2fs'; then
RULESDIR=/data/unencrypted/magisk RULESDIR=/data/unencrypted/magisk
elif grep -q ' /cache ' /proc/mounts; then elif grep -q ' /cache ' /proc/mounts; then
RULESDIR=/cache/magisk RULESDIR=/cache/magisk