Keep module rc path and fix test

Author: Howard20181

app/core/src/main/java/com/topjohnwu/magisk/test/Environment.kt

@@ -157,13 +157,12 @@ class Environment : BaseTest {
             assertTrue(error, initDir.mkdirs())
         }
 
-        assertTrue(error, initDir.getChildFile("init.rc").createNewFile())
+        assertTrue(error, initDir.getChildFile("init_new.rc").createNewFile())
 
         // Add init.rc patch
-        PrintStream(initDir.getChildFile("init.rc").newOutputStream()).use {
-            it.println()
+        PrintStream(initDir.getChildFile("init_new.rc").newOutputStream()).use {
             it.println("on post-fs")
-            it.println("    setprop magisk.init.rc 1")
+            it.println("    setpropd ro.ebug.magisk.rc 1")
             it.println()
         }
 
@@ -172,9 +171,8 @@ class Environment : BaseTest {
         assertTrue(error, productInitDir.mkdirs())
         assertTrue(error, productInitDir.getChildFile("init_new_p.rc").createNewFile())
         PrintStream(productInitDir.getChildFile("init_new_p.rc").newOutputStream()).use {
-            it.println()
-            it.println("on post-fs-data")
-            it.println("    setprop magisk.product.init.rc 1")
+            it.println("on post-fs")
+            it.println("    setprop ro.debug.magisk.product.rc 1")
             it.println()
         }
 

scripts/util_functions.sh

@@ -748,11 +748,8 @@ install_module() {
 
   find "$MODPATH" -mindepth 1 -type f -name "init.rc" -exec rm -f {} \;
   find "$MODPATH" -mindepth 1 -type f -name "*.rc" | while read -r file; do
-        local path="${file/$MODPATH/}"
-        if [ ! -f "$path" ]; then
-          mv "$file" "$MODPATH"
-        fi
         rc=true
+        break
   done
   # Copy over custom sepolicy rules and rc
   if [ -f $MODPATH/sepolicy.rule ] || "$rc"; then