Mount overlays on top of image mount points

[waydroid.git] / tools / helpers / images.py

diff --git a/tools/helpers/images.py b/tools/helpers/images.py
index cf65a119f40ef4b40274d0a5bae35bceb0e49428..e00e9b1f43359f955d5cabae0184a064c3de964e 100644 (file)
--- a/tools/helpers/images.py
+++ b/tools/helpers/images.py
@@ -128,8 +128,19 @@ def make_prop(args, cfg, full_props_path):
 def mount_rootfs(args, images_dir, session):
     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")
     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")
+
     for egl_path in ["/vendor/lib/egl", "/vendor/lib64/egl"]:
         if os.path.isdir(egl_path):
             helpers.mount.bind(