From 9ad03994d1e967acb623e28c28b643e3c7cbb4d0 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 5 Feb 2017 23:40:50 +0800
Subject: [PATCH] Handle disabling

---
 scripts/custom_ramdisk_patch.sh |  2 +-
 scripts/magic_mask.sh           | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/custom_ramdisk_patch.sh b/scripts/custom_ramdisk_patch.sh
index 4cde3dbb7..009593603 100644
--- a/scripts/custom_ramdisk_patch.sh
+++ b/scripts/custom_ramdisk_patch.sh
@@ -51,7 +51,7 @@ for RC in init*.rc; do
     sed -i "/import \/init\.environ\.rc/iimport /init.magisk.rc" $RC
     cpio_add $RC 750
   fi
-  if file_contain "selinux.reload_policy"; then
+  if file_contain "selinux.reload_policy" $RC; then
     sed -i "/selinux.reload_policy/d" $RC
     cpio_add $RC 750
   fi
diff --git a/scripts/magic_mask.sh b/scripts/magic_mask.sh
index 117aef19a..bb9ff6c92 100644
--- a/scripts/magic_mask.sh
+++ b/scripts/magic_mask.sh
@@ -1,6 +1,7 @@
 #!/system/bin/sh
 
 LOGFILE=/cache/magisk.log
+DISABLEFILE=/cache/.disable_magisk
 IMG=/data/magisk.img
 WHITELIST="/system/bin"
 
@@ -253,6 +254,8 @@ case $1 in
     # Cleanup legacy stuffs...
     rm -rf /cache/magisk /cache/magisk_merge /cache/magiskhide.log
 
+    [ -f $DISABLEFILE ] && unblock
+
     if [ -d /cache/magisk_mount ]; then
       log_print "* Mounting cache files"
       find /cache/magisk_mount -type f 2>/dev/null | while read ITEM ; do
@@ -323,7 +326,8 @@ case $1 in
 
       # Remove empty directories, legacy paths, symlinks, old temporary images
       find $MOUNTPOINT -type d -depth ! -path "*core*" -exec rmdir {} \; 2>/dev/null
-      rm -rf $MOUNTPOINT/zzsupersu $MOUNTPOINT/phh $COREDIR/bin $COREDIR/dummy $COREDIR/mirror /data/magisk/*.img /data/busybox 2>/dev/null
+      rm -rf $MOUNTPOINT/zzsupersu $MOUNTPOINT/phh $COREDIR/bin $COREDIR/dummy $COREDIR/mirror \
+             $COREDIR/busybox /data/magisk/*.img /data/busybox 2>/dev/null
 
       # Remove modules that are labeled to be removed
       for MOD in $MOUNTPOINT/* ; do
@@ -356,8 +360,7 @@ case $1 in
       [ ! -f /sbin/launch_daemonsu.sh ] && sh $COREDIR/su/magisksu.sh
       export PATH=$TOOLPATH:$OLDPATH
 
-      # Disable Magic Mount if specified
-      [ -f $APPDIR/disable ] && unblock
+      [ -f $DISABLEFILE ] && unblock
 
       log_print "* Preparing modules"
 
@@ -498,6 +501,10 @@ case $1 in
     # Version info
     MAGISK_VERSION_STUB
     log_print "** Magisk late_start service mode running..."
+    if [ -f $DISABLEFILE ]; then
+      setprop ro.magisk.disable 1
+      exit
+    fi
     run_scripts service
     ;;