From bc27f2211bb1b5dacaf8477b464a21149efede33 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Sat, 30 Oct 2021 23:48:12 -0700
Subject: [PATCH] magisk: Remove Play Services from DenyList earlier

This ensures that GMS will never start before it's removed from the
DenyList, even if another module's service.sh is blocking our script.

Suggested-by: osm0sis <osm0sis@outlook.com>
---
 magisk/customize.sh    | 2 +-
 magisk/post-fs-data.sh | 4 ++++
 magisk/service.sh      | 3 ---
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100755 magisk/post-fs-data.sh

diff --git a/magisk/customize.sh b/magisk/customize.sh
index 8d17802..c1db4b6 100755
--- a/magisk/customize.sh
+++ b/magisk/customize.sh
@@ -1,3 +1,3 @@
 #!/system/bin/sh
 
-chmod 755 "$MODPATH/service.sh"
+chmod 755 "$MODPATH/service.sh" "$MODPATH/post-fs-data.sh"
diff --git a/magisk/post-fs-data.sh b/magisk/post-fs-data.sh
new file mode 100755
index 0000000..6c2af06
--- /dev/null
+++ b/magisk/post-fs-data.sh
@@ -0,0 +1,4 @@
+#!/system/bin/sh
+
+# Remove Play Services from DenyList, otherwise the Zygisk module won't load
+magisk --denylist rm com.google.android.gms
diff --git a/magisk/service.sh b/magisk/service.sh
index 9f07778..28b6ca9 100755
--- a/magisk/service.sh
+++ b/magisk/service.sh
@@ -28,9 +28,6 @@ if [[ "$(cat /sys/fs/selinux/enforce)" == "0" ]]; then
     chmod 440 /sys/fs/selinux/policy
 fi
 
-# Remove Play Services from DenyList, otherwise the Zygisk module won't load
-magisk --denylist rm com.google.android.gms
-
 # Late props which must be set after boot_completed
 {
     until [[ "$(getprop sys.boot_completed)" == "1" ]]; do