From 750872cc37b4cbf26be974d39351f6d168263506 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 12 Aug 2017 16:44:58 +0800
Subject: [PATCH] Add boot actions

---
 build.py                  |  2 +-
 scripts/flash_script.sh   | 11 +++++++----
 scripts/util_functions.sh |  9 +++++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/build.py b/build.py
index d9d47be37..2ff9e66aa 100755
--- a/build.py
+++ b/build.py
@@ -108,7 +108,7 @@ def build_apk(args):
 
 		proc = subprocess.run([
 			os.path.join(os.environ['ANDROID_HOME'], 'build-tools', build_tool, 'zipalign'),
-			'-v', '-p', '4', unsigned, aligned])
+			'-v', '-p', '4', unsigned, aligned], stdout=subprocess.DEVNULL)
 		if proc.returncode != 0:
 			error('Zipalign Magisk Manager failed!')
 
diff --git a/scripts/flash_script.sh b/scripts/flash_script.sh
index f1e96a33b..e0f53c5c6 100644
--- a/scripts/flash_script.sh
+++ b/scripts/flash_script.sh
@@ -83,6 +83,12 @@ ui_print "- Constructing environment"
 
 is_mounted /data && MAGISKBIN=/data/magisk || MAGISKBIN=/cache/data_bin
 
+if $BOOTMODE; then
+  # Cleanup binary mirrors
+  umount -l /dev/magisk/mirror/bin 2>/dev/null
+  rm -rf /dev/magisk/mirror/bin 2>/dev/null
+fi
+
 # Copy required files
 rm -rf $MAGISKBIN 2>/dev/null
 mkdir -p $MAGISKBIN
@@ -103,10 +109,7 @@ fi
 # Magisk Image
 ##########################################################################################
 
-$BOOTMODE || recovery_actions
-
-# Fix SuperSU.....
-$BOOTMODE && $MAGISKBIN/magisk magiskpolicy --live "allow fsck * * *"
+$BOOTMODE && boot_actions || recovery_actions
 
 if (is_mounted /data); then
   IMG=/data/magisk.img
diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh
index 630e731af..1f252018b 100644
--- a/scripts/util_functions.sh
+++ b/scripts/util_functions.sh
@@ -121,6 +121,15 @@ api_level_arch_detect() {
   if [ "$ABILONG" = "x86_64" ]; then ARCH=x64; IS64BIT=true; fi;
 }
 
+boot_actions() {
+  if [ ! -d /dev/magisk/mirror/bin ]; then
+    mkdir -p /dev/magisk/mirror/bin
+    mount -o bind $MAGISKBIN /dev/magisk/mirror/bin
+  fi
+  MAGISKBIN=/dev/magisk/mirror/bin
+  $MAGISKBIN/magisk magiskpolicy --live "allow fsck * * *"
+}
+
 recovery_actions() {
   # TWRP bug fix
   mount -o bind /dev/urandom /dev/random