Archives/NanoDroid
2
0
Fork 0
mirror of https://gitlab.com/Nanolx/NanoDroid synced 2024-10-31 09:20:23 +00:00
Code Issues Projects Releases Wiki Activity

CommonInstaller: don't treat magisk_merge.img special

Browse Source
This commit is contained in:
Christopher Roy Bratusek 2018-07-11 22:11:34 +02:00
parent fe880377da
commit 7ae60be257
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.md
View File

@ -4,6 +4,8 @@
### Bug Fixes
* CommonInstaller
* fix installation through Magisk Manager
* nanodroid-overlay Script
* fix `-r` parameter not working

2
CommonInstaller
View File

@ -401,7 +401,7 @@ magisk_install_setup () {
ui_print " > setup Magisk environment"
MAGISKBIN=/data/adb/magisk
${BOOTMODE} && MOUNTPATH=${TMPDIR}/magisk_merge_img || MOUNTPATH=${TMPDIR}/magisk_img
MOUNTPATH=${TMPDIR}/magisk_img
[ -d ${MAGISKBIN} -a -f ${MAGISKBIN}/magisk -a -f ${MAGISKBIN}/util_functions.sh ] || \
error " !! Magisk version 15.0 or newer is required"

2
Full/system/xbin/nanodroid-overlay
View File

@ -5,8 +5,6 @@ export MODPATH=@MODPATH@
if [[ -d /dev/tmp/magisk_img/$(basename ${MODPATH}) ]]; then
OVERLAY_PATH=/dev/tmp/magisk_img/$(basename ${MODPATH})
elif [[ -d /dev/tmp/magisk_merge_img/$(basename ${MODPATH}) ]]; then
OVERLAY_PATH=/dev/tmp/magisk_merge_img/$(basename ${MODPATH})
else
OVERLAY_PATH=${MODPATH}
[[ "${MODPATH}" != "/sbin/.core/"* ]] && NO_MAGISK=1