TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-22 16:07:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct comment

Browse Source 
For file-based encryption, /data/adb is always required to encrypt
https://android.googlesource.com/platform/system/extras/+/refs/tags/android-7.0.0_r36/ext4_utils/ext4_crypt_init_extensions.cpp
68258e8444%5E%21/
This commit is contained in:
vvb2060 2021-03-14 00:32:30 +08:00 committed by John Wu
parent 0783f3d5b6
commit 7a007b342a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,7 +289,7 @@ void post_fs_data(int client) {
} else { } else {
// If the folder is not automatically created by Android, // If the folder is not automatically created by Android,
// do NOT proceed further. Manual creation of the folder // do NOT proceed further. Manual creation of the folder
// will cause bootloops on FBE devices. // will have no encryption flag, which will cause bootloops on FBE devices.
LOGE(SECURE_DIR " is not present, abort\n"); LOGE(SECURE_DIR " is not present, abort\n");
goto early_abort; goto early_abort;
} }

3
scripts/util_functions.sh
View File

@ -528,9 +528,8 @@ check_data() {
if grep ' /data ' /proc/mounts | grep -vq 'tmpfs'; then if grep ' /data ' /proc/mounts | grep -vq 'tmpfs'; then
# Test if data is writable # Test if data is writable
touch /data/.rw && rm /data/.rw && DATA=true touch /data/.rw && rm /data/.rw && DATA=true
# Test if DE storage is writable # Test if data is decrypted
$DATA && [ -d /data/adb ] && touch /data/adb/.rw && rm /data/adb/.rw && DATA_DE=true $DATA && [ -d /data/adb ] && touch /data/adb/.rw && rm /data/adb/.rw && DATA_DE=true
# Some recovery have broken FDE implementations, which cannot access existing folders
$DATA_DE && [ -d /data/adb/magisk ] || mkdir /data/adb/magisk || DATA_DE=false $DATA_DE && [ -d /data/adb/magisk ] || mkdir /data/adb/magisk || DATA_DE=false
fi fi
NVBASE=/data NVBASE=/data