From df74d83eb03a44cc6ad268841ac2ada28d077c77 Mon Sep 17 00:00:00 2001 From: vvb2060 Date: Sun, 7 Jan 2024 12:57:41 +0800 Subject: [PATCH] set mount ns propagation to slave --- magisk-loader/magisk_module/daemon | 2 -- magisk-loader/magisk_module/post-fs-data.sh | 2 +- magisk-loader/magisk_module/service.sh | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/magisk-loader/magisk_module/daemon b/magisk-loader/magisk_module/daemon index fa00052bae6..fb08a51031c 100644 --- a/magisk-loader/magisk_module/daemon +++ b/magisk-loader/magisk_module/daemon @@ -7,11 +7,9 @@ flavor=@FLAVOR@ if [ -r $tmpLspdApk ]; then java_options="-Djava.class.path=$tmpLspdApk" - java_options="$java_options -Dlsp.library.path=/data/local/tmp" debug="true" else java_options="-Djava.class.path=$dir/daemon.apk" - java_options="$java_options -Dlsp.library.path=$dir" fi if [ $debug = "true" ]; then diff --git a/magisk-loader/magisk_module/post-fs-data.sh b/magisk-loader/magisk_module/post-fs-data.sh index d032edb2b93..c0234f4da84 100644 --- a/magisk-loader/magisk_module/post-fs-data.sh +++ b/magisk-loader/magisk_module/post-fs-data.sh @@ -23,4 +23,4 @@ rm -f "/data/local/tmp/daemon.apk" rm -f "/data/local/tmp/manager.apk" cd "$MODDIR" -unshare -m sh -c "$MODDIR/daemon $@&" +unshare --propagation slave -m sh -c "$MODDIR/daemon $@&" diff --git a/magisk-loader/magisk_module/service.sh b/magisk-loader/magisk_module/service.sh index 0b988e22844..48b99320fab 100644 --- a/magisk-loader/magisk_module/service.sh +++ b/magisk-loader/magisk_module/service.sh @@ -20,4 +20,4 @@ MODDIR=${0%/*} cd "$MODDIR" # post-fs-data.sh may be blocked by other modules. retry to start this -unshare -m sh -c "$MODDIR/daemon --from-service $@&" +unshare --propagation slave -m sh -c "$MODDIR/daemon --from-service $@&"