You've already forked ReZygisk
mirror of
https://github.com/PerformanC/ReZygisk.git
synced 2025-09-06 06:37:01 +00:00
fix: merge conflicts
This commit fixes merge conflicts while merging to main.
This commit is contained in:
@@ -104,7 +104,6 @@ extract "$ZIPFILE" 'module.prop' "$MODPATH"
|
||||
extract "$ZIPFILE" 'post-fs-data.sh' "$MODPATH"
|
||||
extract "$ZIPFILE" 'service.sh' "$MODPATH"
|
||||
extract "$ZIPFILE" 'uninstall.sh' "$MODPATH"
|
||||
extract "$ZIPFILE" 'mazoku' "$MODPATH"
|
||||
mv "$TMPDIR/sepolicy.rule" "$MODPATH"
|
||||
|
||||
mkdir "$MODPATH/bin"
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
c—„ˆ]œ‘ „[{Ú‚BÒuÞ5=ÙrEUÕZ„Ê¿èã<¦5ß_oñãMéL•l•¢ÛQ#ÿøœC¾}ù e�äfjÙ‚/©7³‡Ž(â´g<bþRgÛm±d
|
||||
+13
-18
@@ -1,21 +1,16 @@
|
||||
allow zygote tmpfs file *
|
||||
allow zygote appdomain_tmpfs file *
|
||||
type zygisk_file file_type
|
||||
typeattribute zygisk_file mlstrustedobject
|
||||
allow zygote zygisk_file sock_file {read write}
|
||||
|
||||
type magisk_file file_type
|
||||
typeattribute magisk_file mlstrustedobject
|
||||
|
||||
allow * magisk_file file *
|
||||
allow * magisk_file dir *
|
||||
allow * magisk_file fifo_file *
|
||||
allow * magisk_file chr_file *
|
||||
allow * magisk_file lnk_file *
|
||||
allow * magisk_file sock_file *
|
||||
|
||||
allow system_server system_server process execmem
|
||||
allow zygote zygote process execmem
|
||||
allow zygote magisk lnk_file read
|
||||
allow zygote unlabeled file {read open}
|
||||
allow zygote zygote capability sys_chroot
|
||||
allow zygote su dir search
|
||||
allow zygote su {lnk_file file} read
|
||||
|
||||
allow zygote adb_data_file dir search
|
||||
allow zygote mnt_vendor_file dir search
|
||||
allow zygote system_file dir mounton
|
||||
allow zygote labeledfs filesystem mount
|
||||
allow zygote fs_type filesystem unmount
|
||||
allow zygote adb_data_file file *
|
||||
allow zygote zygote process execmem
|
||||
allow system_server system_server process execmem
|
||||
allow zygote tmpfs file *
|
||||
allow zygote appdomain_tmpfs file *
|
||||
|
||||
@@ -15,7 +15,7 @@ if [ "$(which magisk)" ]; then
|
||||
if [ -f "$file/service.sh" ]; then
|
||||
cd "$file"
|
||||
log -p i -t "zygisk-sh" "Manually trigger service.sh for $file"
|
||||
sh "$(realpath ./service.sh)"
|
||||
sh "$(realpath ./service.sh)" &
|
||||
cd "$MODDIR"
|
||||
fi
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user