TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-08 03:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix $RECOVERYMODE from config being incorrectly overridden

Browse Source 
Move legacy SAR checking logic into mount_partitions, and avoid calling get_flags before check_boot_ramdisk
Fix #7346
This commit is contained in:
canyie
2023-09-24 16:22:24 +08:00
committed by John Wu
parent f5d3a71478
commit 187f583c95
2 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/res/raw/manager.sh
View File

@@ -195,6 +195,9 @@ mount_partitions() {
# Check whether non rootfs root dir exists
SYSTEM_AS_ROOT=false
grep ' / ' /proc/mounts | grep -qv 'rootfs' && SYSTEM_AS_ROOT=true
LEGACYSAR=false
grep ' / ' /proc/mounts | grep -q '/dev/root' && LEGACYSAR=true
}
get_flags() {
@@ -210,15 +213,6 @@ get_flags() {
PATCHVBMETAFLAG=true
fi
[ -z $RECOVERYMODE ] && RECOVERYMODE=false
if $SYSTEM_AS_ROOT; then
if grep ' / ' /proc/mounts | grep -q '/dev/root'; then
LEGACYSAR=true
else
LEGACYSAR=false
fi
else
LEGACYSAR=false
fi
}
run_migrations() { return; }
@@ -231,9 +225,9 @@ grep_prop() { return; }
app_init() {
mount_partitions
get_flags
RAMDISKEXIST=false
check_boot_ramdisk && RAMDISKEXIST=true
get_flags
run_migrations
SHA1=$(grep_prop SHA1 $MAGISKTMP/.magisk/config)
check_encryption