From: Alessandro Astone <ales.astone@gmail.com>
Date: Sat, 28 Jan 2023 16:27:16 +0000 (+0100)
Subject: Disable overlays if mounting fails once
X-Git-Tag: 1.4.0~10
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/a8a93fdc7d40eac2bf60caca3ff81f52f5add92e

Disable overlays if mounting fails once

This is not a critical feature.
---

diff --git a/tools/helpers/images.py b/tools/helpers/images.py
index 65a7ea5..7436d6d 100644
--- a/tools/helpers/images.py
+++ b/tools/helpers/images.py
@@ -143,11 +143,17 @@ def mount_rootfs(args, images_dir, session):
     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"]],
+        try:
+            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")
+        except RuntimeError:
+            cfg["waydroid"]["mount_overlays"] = "False"
+            tools.config.save(args, cfg)
+            logging.warning("Mounting overlays failed. The feature has been disabled.")
+
     helpers.mount.mount(args, images_dir + "/vendor.img",
                            tools.config.defaults["rootfs"] + "/vendor")
     if cfg["waydroid"]["mount_overlays"] == "True":