From 8d846993ee6b16bf6f30821e8f0dd35f07364180 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Tue, 3 Jan 2017 01:55:19 +0800
Subject: [PATCH] Load system.prop; longer waiting time

---
 scripts/magic_mask.sh            | 3 ++-
 zip_static/common/init.magisk.rc | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/magic_mask.sh b/scripts/magic_mask.sh
index 4741b5f38..13bd2b188 100644
--- a/scripts/magic_mask.sh
+++ b/scripts/magic_mask.sh
@@ -2,7 +2,6 @@
 
 LOGFILE=/cache/magisk.log
 IMG=/data/magisk.img
-# BLACKLIST="/system/lib /system/lib64 /system/etc /system/framework /vendor/lib /vendor/lib64"
 WHITELIST="/system/app /system/priv-app /system/bin"
 
 MOUNTPOINT=/magisk
@@ -366,6 +365,8 @@ case $1 in
 
       # Travel through all mods
       for MOD in $MOUNTPOINT/* ; do
+        # Read in defined system props
+        [ -f $MOD/system.prop ] && /data/magisk/resetprop --file $MOD/system.prop
         if [ -f $MOD/auto_mount -a -d $MOD/system -a ! -f $MOD/disable ]; then
           TRAVEL_ROOT=$MOD
           (travel system)
diff --git a/zip_static/common/init.magisk.rc b/zip_static/common/init.magisk.rc
index e3505bc47..a99f8b4bb 100644
--- a/zip_static/common/init.magisk.rc
+++ b/zip_static/common/init.magisk.rc
@@ -7,7 +7,7 @@ on post-fs
 
 on post-fs-data
     start magisk_pfsd
-    wait /dev/.magisk.unblock 40
+    wait /dev/.magisk.unblock 60
     rm /dev/.magisk.unblock
 
 on property:magisk.restart_pfsd=1