TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-20 00:48:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts: uninstaller fixes

Browse Source 
- LOS Recovery can't decrypt or even mount /data, thus the installer can't do everything it needs to do and must abort, so also suggest uninstall via Manager at that point
- fix removal of addon.d script when uninstall is run via Manager on SAR
- fix removal of addon.d with dynamic/logical partitions via mapper
This commit is contained in:
Chris Renshaw 2020-06-18 01:30:50 -03:00 committed by John Wu
parent 43146b8316
commit f79a40a67a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/magisk_uninstaller.sh
View File

@ -35,7 +35,7 @@ setup_flashable
print_title "Magisk Uninstaller" print_title "Magisk Uninstaller"
is_mounted /data || mount /data || abort "! Unable to mount partitions" is_mounted /data || mount /data || abort "! Unable to mount /data, please uninstall with Magisk Manager"
is_mounted /cache || mount /cache 2>/dev/null is_mounted /cache || mount /cache 2>/dev/null
mount_partitions mount_partitions
@ -144,7 +144,8 @@ rm -rf \
/data/adb/post-fs-data.d /data/adb/service.d /data/adb/modules* $PERSISTDIR/magisk 2>/dev/null /data/adb/post-fs-data.d /data/adb/service.d /data/adb/modules* $PERSISTDIR/magisk 2>/dev/null
if [ -f /system/addon.d/99-magisk.sh ]; then if [ -f /system/addon.d/99-magisk.sh ]; then
mount -o rw,remount /system blockdev --setrw /dev/block/mapper/system$SLOT 2>/dev/null
mount -o rw,remount /system || mount -o rw,remount /
rm -f /system/addon.d/99-magisk.sh rm -f /system/addon.d/99-magisk.sh
fi fi