From 4dfb193d10f24fbc96a88c1d13821f471621ba81 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Tue, 16 Nov 2021 21:29:13 -0800
Subject: [PATCH] Always run non disabled module post-fs-data scripts

---
 native/jni/core/module.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/native/jni/core/module.cpp b/native/jni/core/module.cpp
index bda3cb6c7..737289da3 100644
--- a/native/jni/core/module.cpp
+++ b/native/jni/core/module.cpp
@@ -703,13 +703,13 @@ static void collect_modules(bool open_zygisk) {
             return;
 
         module_info info;
-        if (zygisk_enabled) {
-            // Riru and its modules are not compatible with zygisk
-            if (entry->d_name == "riru-core"sv || faccessat(modfd, "riru", F_OK, 0) == 0) {
-                LOGI("%s: ignore\n", entry->d_name);
-                return;
-            }
-            if (open_zygisk) {
+        if (open_zygisk) {
+            if (zygisk_enabled) {
+                // Riru and its modules are not compatible with zygisk
+                if (entry->d_name == "riru-core"sv || faccessat(modfd, "riru", F_OK, 0) == 0) {
+                    LOGI("%s: ignore\n", entry->d_name);
+                    return;
+                }
 #if defined(__arm__)
                 info.z32 = openat(modfd, "zygisk/armeabi-v7a.so", O_RDONLY | O_CLOEXEC);
 #elif defined(__aarch64__)
@@ -723,18 +723,18 @@ static void collect_modules(bool open_zygisk) {
 #else
 #error Unsupported ABI
 #endif
-            }
-        } else {
-            // Ignore zygisk modules when zygisk is not enabled
-            if (faccessat(modfd, "zygisk", F_OK, 0) == 0) {
-                LOGI("%s: ignore\n", entry->d_name);
-                return;
+            } else {
+                // Ignore zygisk modules when zygisk is not enabled
+                if (faccessat(modfd, "zygisk", F_OK, 0) == 0) {
+                    LOGI("%s: ignore\n", entry->d_name);
+                    return;
+                }
             }
         }
         info.name = entry->d_name;
         modules->push_back(info);
     });
-    if (zygisk_enabled) {
+    if (open_zygisk && zygisk_enabled) {
         bool use_memfd = true;
         auto convert_to_memfd = [&](int fd) -> int {
             if (fd < 0)