upgrade: Remove session.cfg during 1.4.0 migration

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

diff --git a/tools/helpers/images.py b/tools/helpers/images.py
index ac85f4faca001109157047239dc5894256343295..3f1929c68af7445491650fa86f2eade9934d958a 100644 (file)
--- a/tools/helpers/images.py
+++ b/tools/helpers/images.py
@@ -4,6 +4,7 @@ import logging
 import zipfile
 import json
 import hashlib
+import shutil
 import os
 import tools.config
 from tools import helpers
@@ -78,6 +79,7 @@ def get(args):
             tools.config.save(args, cfg)
             os.remove(images_zip)
             break
+    remove_overlay(args)
 
 def replace(args, system_zip, system_time, vendor_zip, vendor_time):
     cfg = tools.config.load(args)
@@ -92,8 +94,15 @@ def replace(args, system_zip, system_time, vendor_zip, vendor_time):
             zip_ref.extractall(args.images_path)
         cfg["waydroid"]["vendor_datetime"] = str(vendor_time)
         tools.config.save(args, cfg)
+    remove_overlay(args)
 
-def make_prop(args, full_props_path):
+def remove_overlay(args):
+    if os.path.isdir(tools.config.defaults["overlay_rw"]):
+        shutil.rmtree(tools.config.defaults["overlay_rw"])
+    if os.path.isdir(tools.config.defaults["overlay_work"]):
+        shutil.rmtree(tools.config.defaults["overlay_work"])
+
+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 +110,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 +124,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 +134,25 @@ 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):
+    cfg = tools.config.load(args)
     helpers.mount.mount(args, images_dir + "/system.img",
                         tools.config.defaults["rootfs"], umount=True)
+    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")
+    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):
             helpers.mount.bind(
@@ -144,7 +165,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")