priyatham/waydroid_script
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix installation for 32bit magisk

Browse source
This commit is contained in:
Rikka 2023-01-02 01:18:35 +08:00
parent cbcd5365c8
commit 2ac0285722
No known key found for this signature in database
GPG key ID: DAD154970C8AB6F2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
waydroid_extras.py
View file

@ -418,10 +418,12 @@ def install_magisk():
extract_to = "/tmp/magisk_unpack" extract_to = "/tmp/magisk_unpack"
sys_image_mount = "/tmp/waydroidimage" sys_image_mount = "/tmp/waydroidimage"
magisk_dir = os.path.join(sys_image_mount, "system", "etc", "init", "magisk") magisk_dir = os.path.join(sys_image_mount, "system", "etc", "init", "magisk")
arch_dir = "x86" if "x86" in platform.machine() else "arm"
arch = "_64" if "64" in platform.machine() else ""
init_rc_component = """ init_rc_component = """
on post-fs-data on post-fs-data
start logd start logd
exec - root root -- /system/etc/init/magisk/magisk64 --setup-sbin /system/etc/init/magisk exec - root root -- /system/etc/init/magisk/magisk{arch} --setup-sbin /system/etc/init/magisk
exec - root root -- /system/etc/init/magisk/magiskpolicy --live --magisk "allow * magisk_file lnk_file *" exec - root root -- /system/etc/init/magisk/magiskpolicy --live --magisk "allow * magisk_file lnk_file *"
mkdir /sbin/.magisk 700 mkdir /sbin/.magisk 700
mkdir /sbin/.magisk/mirror 700 mkdir /sbin/.magisk/mirror 700
@ -450,7 +452,7 @@ on property:init.svc.zygote=restarting
on property:init.svc.zygote=stopped on property:init.svc.zygote=stopped
exec - root root -- /sbin/magisk --zygote-restart exec - root root -- /sbin/magisk --zygote-restart
""" """.format(arch=32 if arch=="" else 64)
system_img = os.path.join(get_image_dir(), "system.img") system_img = os.path.join(get_image_dir(), "system.img")
if not os.path.isfile(system_img): if not os.path.isfile(system_img):
@ -486,8 +488,6 @@ on property:init.svc.zygote=stopped
# Now setup and install magisk binary and app # Now setup and install magisk binary and app
print("==> Installing magisk now ...") print("==> Installing magisk now ...")
arch_dir = "x86" if "x86" in platform.machine() else "arm"
arch = "_64" if "64" in platform.machine() else ""
lib_dir = os.path.join(extract_to, "lib", "{arch_dir}{arch}".format(arch_dir=arch_dir, arch=arch)) lib_dir = os.path.join(extract_to, "lib", "{arch_dir}{arch}".format(arch_dir=arch_dir, arch=arch))
for parent, dirnames, filenames in os.walk(lib_dir): for parent, dirnames, filenames in os.walk(lib_dir):