Skip to content

Commit 752d88c

Browse files
committed
Start LSPosed daemon in service.sh
This reverts partially commit c622d0f. In my test device (Pixel 6, Android 16 qpr2, KernelSU), calling twice LSPosed daemon results a detection based on `mount_id` values. In `com.reveny.nativecheck` 7.6.1, it is named as `Detected Magic Mount`. Of course, this namning is incorrect and misleading. Whatever, see JingMatrix/NeoZygisk#39 for details of this detection point.
1 parent f5af569 commit 752d88c

File tree

4 files changed

+5
-32
lines changed

4 files changed

+5
-32
lines changed

daemon/src/main/java/org/lsposed/lspd/service/ServiceManager.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ public static void start(String[] args) {
9999

100100
int systemServerMaxRetry = 1;
101101
for (String arg : args) {
102-
if (arg.equals("--from-service")) {
103-
Log.w(TAG, "LSPosed daemon is not started properly. Try for a late start...");
104-
} else if (arg.startsWith("--system-server-max-retry=")) {
102+
if (arg.startsWith("--system-server-max-retry=")) {
105103
try {
106104
systemServerMaxRetry = Integer.parseInt(arg.substring(arg.lastIndexOf('=') + 1));
107105
} catch (Throwable ignored) {

magisk-loader/magisk_module/customize.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ ui_print "- Extracting module files"
7373

7474
extract "$ZIPFILE" 'module.prop' "$MODPATH"
7575
extract "$ZIPFILE" 'action.sh' "$MODPATH"
76-
extract "$ZIPFILE" 'post-fs-data.sh' "$MODPATH"
7776
extract "$ZIPFILE" 'service.sh' "$MODPATH"
7877
extract "$ZIPFILE" 'uninstall.sh' "$MODPATH"
7978
extract "$ZIPFILE" 'sepolicy.rule' "$MODPATH"

magisk-loader/magisk_module/post-fs-data.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

magisk-loader/magisk_module/service.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#
1919

2020
MODDIR=${0%/*}
21+
2122
cd "$MODDIR"
22-
# post-fs-data.sh may be blocked by other modules. retry to start this
23-
unshare --propagation slave -m sh -c "$MODDIR/daemon --from-service $@&"
23+
24+
# To avoid delaying the normal mount timing of zygote, we start LSPosed service daemon in late_start service mode instead of post-fs-data mode
25+
unshare --propagation slave -m sh -c "$MODDIR/daemon $@&"

0 commit comments

Comments
 (0)