Make overlays opt-out

diff --git a/tools/config/__init__.py b/tools/config/__init__.py
index 1edbf1761ade67fb3e09158ae7b0b563f0b102ac..354f38404ac792552bbb2234a2eeafc1557cbb99 100644 (file)
--- a/tools/config/__init__.py
+++ b/tools/config/__init__.py
@@ -21,7 +21,8 @@ config_keys = ["arch",
                "vendor_type",
                "system_datetime",
                "vendor_datetime",
                "vendor_type",
                "system_datetime",
                "vendor_datetime",

-               "suspend_action"]
+               "suspend_action",
+               "mount_overlays"]

 
 # Config file/commandline default values
 # $WORK gets replaced with the actual value for args.work (which may be
 
 # Config file/commandline default values
 # $WORK gets replaced with the actual value for args.work (which may be


@@ -36,7 +37,8 @@ defaults = {
         "/etc/waydroid-extra/images",
         "/usr/share/waydroid-extra/images",
     ],
         "/etc/waydroid-extra/images",
         "/usr/share/waydroid-extra/images",
     ],

-    "suspend_action": "freeze"
+    "suspend_action": "freeze",
+    "mount_overlays": "True",

 }
 defaults["images_path"] = defaults["work"] + "/images"
 defaults["rootfs"] = defaults["work"] + "/rootfs"
 }
 defaults["images_path"] = defaults["work"] + "/images"
 defaults["rootfs"] = defaults["work"] + "/rootfs"

diff --git a/tools/helpers/images.py b/tools/helpers/images.py
index c5d5fad70d907521bcf17eed7d898b7888e11782..3f1929c68af7445491650fa86f2eade9934d958a 100644 (file)
--- 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):
     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(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(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):
 
     for egl_path in ["/vendor/lib/egl", "/vendor/lib64/egl"]:
         if os.path.isdir(egl_path):