diff --git a/jni/sepolicy-inject b/jni/sepolicy-inject index 9a1493117..443af5f76 160000 --- a/jni/sepolicy-inject +++ b/jni/sepolicy-inject @@ -1 +1 @@ -Subproject commit 9a14931175dfabe4008679343b358cc16c02cbd4 +Subproject commit 443af5f760b94f8728b4a4c82adf911717d4dc52 diff --git a/jni/su b/jni/su index dd0127a39..d364ed2d7 160000 --- a/jni/su +++ b/jni/su @@ -1 +1 @@ -Subproject commit dd0127a3919b7ebed930f3e7aed6e3ff3684f714 +Subproject commit d364ed2d7721cbfc5652c66a51e97408cd6be458 diff --git a/scripts/custom_ramdisk_patch.sh b/scripts/custom_ramdisk_patch.sh index 9191faf7a..83386d91e 100644 --- a/scripts/custom_ramdisk_patch.sh +++ b/scripts/custom_ramdisk_patch.sh @@ -62,7 +62,7 @@ for RC in init*.rc; do done # sepolicy patches -LD_LIBRARY_PATH=$SYSTEMLIB $BINDIR/sepolicy-inject --magisk -P sepolicy +LD_LIBRARY_PATH=$SYSTEMLIB $BINDIR/sepolicy-inject --load sepolicy --save sepolicy --minimal cpio_add sepolicy 644 # Add new items diff --git a/scripts/flash_script.sh b/scripts/flash_script.sh index 578a4a923..b3b78cfeb 100644 --- a/scripts/flash_script.sh +++ b/scripts/flash_script.sh @@ -350,7 +350,7 @@ PATH=$TMPDIR/busybox:$PATH ########################################################################################## # Fix SuperSU..... -($BOOTMODE) && $BINDIR/sepolicy-inject -s fsck --live +($BOOTMODE) && $BINDIR/sepolicy-inject --live "allow fsck * * *" if (is_mounted /data); then IMG=/data/magisk.img @@ -374,10 +374,10 @@ fi MAGISKLOOP=$LOOPDEVICE # Core folders and scripts -mkdir -p $COREDIR/magiskhide $COREDIR/postfsdata.d $COREDIR/service.d 2>/dev/null +mkdir -p $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d 2>/dev/null cp -af $INSTALLER/common/magiskhide/. $BINDIR/magiskhide $COREDIR/magiskhide -chmod -R 755 $COREDIR/magiskhide $COREDIR/postfsdata.d $COREDIR/service.d -chown -R 0.0 $COREDIR/magiskhide $COREDIR/postfsdata.d $COREDIR/service.d +chmod -R 755 $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d +chown -R 0.0 $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d ########################################################################################## # Boot image patch @@ -529,7 +529,7 @@ else fi # minimal sepolicy patches - LD_LIBRARY_PATH=$SYSTEMLIB $BINDIR/sepolicy-inject --minimal -P sepolicy + LD_LIBRARY_PATH=$SYSTEMLIB $BINDIR/sepolicy-inject --load sepolicy --save sepolicy --minimal # Add new items mkdir -p magisk 2>/dev/null diff --git a/scripts/magisksu.sh b/scripts/magisksu.sh index 0e09e1e82..c16ebe64d 100644 --- a/scripts/magisksu.sh +++ b/scripts/magisksu.sh @@ -11,7 +11,7 @@ log_print() { log_print "Moving and linking /sbin binaries" mount -o rw,remount rootfs / -/data/busybox/cp -afc /sbin /sbin_orig +/dev/busybox/cp -afc /sbin /sbin_orig mount -o ro,remount rootfs / log_print "Exposing su binary" diff --git a/zip_static/arm/busybox b/zip_static/arm/busybox index 985254672..2226bf620 100644 Binary files a/zip_static/arm/busybox and b/zip_static/arm/busybox differ diff --git a/zip_static/arm64/busybox b/zip_static/arm64/busybox index a68668126..be1606105 100644 Binary files a/zip_static/arm64/busybox and b/zip_static/arm64/busybox differ diff --git a/zip_static/x64/busybox b/zip_static/x64/busybox index e33878c2d..b3430eb50 100644 Binary files a/zip_static/x64/busybox and b/zip_static/x64/busybox differ diff --git a/zip_static/x86/busybox b/zip_static/x86/busybox index a83050ad9..feed95124 100644 Binary files a/zip_static/x86/busybox and b/zip_static/x86/busybox differ