X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/1361b3a7cbf35746884f4454b976528139911576..40c6aa7ac2bcf00f42efd43be4c0a06dec1ed0a6:/tools/helpers/images.py

diff --git a/tools/helpers/images.py b/tools/helpers/images.py
index ac85f4f..e00e9b1 100644
--- a/tools/helpers/images.py
+++ b/tools/helpers/images.py
@@ -93,7 +93,7 @@ def replace(args, system_zip, system_time, vendor_zip, vendor_time):
         cfg["waydroid"]["vendor_datetime"] = str(vendor_time)
         tools.config.save(args, cfg)
 
-def make_prop(args, full_props_path):
+def make_prop(args, cfg, full_props_path):
     if not os.path.isfile(args.work + "/waydroid_base.prop"):
         raise RuntimeError("waydroid_base.prop Not found")
     with open(args.work + "/waydroid_base.prop") as f:
@@ -101,10 +101,8 @@ def make_prop(args, full_props_path):
     if not props:
         raise RuntimeError("waydroid_base.prop is broken!!?")
 
-    session_cfg = tools.config.load_session()
-
     def add_prop(key, cfg_key):
-        value = session_cfg["session"][cfg_key]
+        value = cfg[cfg_key]
         if value != "None":
             value = value.replace("/mnt/", "/mnt_extra/")
             props.append(key + "=" + value)
@@ -117,7 +115,7 @@ def make_prop(args, full_props_path):
     add_prop("waydroid.wayland_display", "wayland_display")
     if which("waydroid-sensord") is None:
         props.append("waydroid.stub_sensors_hal=1")
-    dpi = session_cfg["session"]["lcd_density"]
+    dpi = cfg["lcd_density"]
     if dpi != "0":
         props.append("ro.sf.lcd_density=" + dpi)
 
@@ -127,11 +125,22 @@ def make_prop(args, full_props_path):
     final_props.close()
     os.chmod(full_props_path, 0o644)
 
-def mount_rootfs(args, images_dir):
+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(
@@ -144,7 +153,7 @@ def mount_rootfs(args, images_dir):
             helpers.mount.bind(
                 args, "/vendor/odm", tools.config.defaults["rootfs"] + "/odm_extra")
 
-    make_prop(args, args.work + "/waydroid.prop")
+    make_prop(args, session, args.work + "/waydroid.prop")
     helpers.mount.bind_file(args, args.work + "/waydroid.prop",
                             tools.config.defaults["rootfs"] + "/vendor/waydroid.prop")