From 9fc385e2bdfb479b4b48ede3054400ab8c0d1e3c Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Fri, 13 Aug 2021 02:54:32 +0800
Subject: [PATCH] [core] unshare daemon (#892)

---
 core/magisk_module/post-fs-data.sh                              | 2 +-
 core/magisk_module/service.sh                                   | 2 +-
 core/src/main/java/org/lsposed/lspd/service/ServiceManager.java | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/magisk_module/post-fs-data.sh b/core/magisk_module/post-fs-data.sh
index 4a85f651..64187126 100644
--- a/core/magisk_module/post-fs-data.sh
+++ b/core/magisk_module/post-fs-data.sh
@@ -136,4 +136,4 @@ if [ ! -z "${MISC_PATH}" ]; then
 fi
 
 rm -f "/data/local/tmp/lspd.dex"
-"$MODDIR/lspd"
+unshare -m sh -c "$MODDIR/lspd &"
diff --git a/core/magisk_module/service.sh b/core/magisk_module/service.sh
index 48cb19ed..9497a180 100644
--- a/core/magisk_module/service.sh
+++ b/core/magisk_module/service.sh
@@ -21,4 +21,4 @@
 
 MODDIR=${0%/*}
 # post-fs-data.sh may be blocked by other modules. retry to start this
-"$MODDIR/lspd" --from-service
+unshare -m $MODDIR/lspd --from-service
diff --git a/core/src/main/java/org/lsposed/lspd/service/ServiceManager.java b/core/src/main/java/org/lsposed/lspd/service/ServiceManager.java
index dfc32dd1..31d1bc83 100644
--- a/core/src/main/java/org/lsposed/lspd/service/ServiceManager.java
+++ b/core/src/main/java/org/lsposed/lspd/service/ServiceManager.java
@@ -85,8 +85,6 @@ public class ServiceManager {
 
         systemServerService.putBinderForSystemServer();
 
-        Process.killProcess(Os.getppid());
-
         DdmHandleAppName.setAppName("lspd", 0);
 
         waitSystemService("package");