X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/5718ba8b068a83ad07ebdfdfd02d5c3a2bc35aca..e87b848b9b2acaa4952eb92e339e575d25281d3a:/tools/helpers/images.py diff --git a/tools/helpers/images.py b/tools/helpers/images.py index c5d5fad..3f1929c 100644 --- a/tools/helpers/images.py +++ b/tools/helpers/images.py @@ -135,20 +135,23 @@ def make_prop(args, cfg, full_props_path): os.chmod(full_props_path, 0o644) def mount_rootfs(args, images_dir, session): + cfg = tools.config.load(args) helpers.mount.mount(args, images_dir + "/system.img", tools.config.defaults["rootfs"], umount=True) - helpers.mount.mount_overlay(args, [tools.config.defaults["overlay"], - tools.config.defaults["rootfs"]], - tools.config.defaults["rootfs"], - upper_dir=tools.config.defaults["overlay_rw"] + "/system", - work_dir=tools.config.defaults["overlay_work"] + "/system") + if cfg["waydroid"]["mount_overlays"] == "True": + helpers.mount.mount_overlay(args, [tools.config.defaults["overlay"], + tools.config.defaults["rootfs"]], + tools.config.defaults["rootfs"], + upper_dir=tools.config.defaults["overlay_rw"] + "/system", + work_dir=tools.config.defaults["overlay_work"] + "/system") helpers.mount.mount(args, images_dir + "/vendor.img", tools.config.defaults["rootfs"] + "/vendor") - helpers.mount.mount_overlay(args, [tools.config.defaults["overlay"] + "/vendor", - tools.config.defaults["rootfs"] + "/vendor"], - tools.config.defaults["rootfs"] + "/vendor", - upper_dir=tools.config.defaults["overlay_rw"] + "/vendor", - work_dir=tools.config.defaults["overlay_work"] + "/vendor") + if cfg["waydroid"]["mount_overlays"] == "True": + helpers.mount.mount_overlay(args, [tools.config.defaults["overlay"] + "/vendor", + tools.config.defaults["rootfs"] + "/vendor"], + tools.config.defaults["rootfs"] + "/vendor", + upper_dir=tools.config.defaults["overlay_rw"] + "/vendor", + work_dir=tools.config.defaults["overlay_work"] + "/vendor") for egl_path in ["/vendor/lib/egl", "/vendor/lib64/egl"]: if os.path.isdir(egl_path):