interfaces: Fix ServiceManager race condition in clients

[waydroid.git] / tools / config / __init__.py

diff --git a/tools/config/__init__.py b/tools/config/__init__.py
index 2ec77dcd62a50059a797377319622167cb8a9fa4..354f38404ac792552bbb2234a2eeafc1557cbb99 100644 (file)
--- a/tools/config/__init__.py
+++ b/tools/config/__init__.py
@@ -6,8 +6,8 @@ import pwd
 #
 # Exported functions
 #
-from tools.config.load import load, load_session, load_channels
-from tools.config.save import save, save_session
+from tools.config.load import load, load_channels
+from tools.config.save import save
 
 #
 # Exported variables (internal configuration)
@@ -21,19 +21,8 @@ config_keys = ["arch",
                "vendor_type",
                "system_datetime",
                "vendor_datetime",
-               "suspend_action"]
-
-session_config_keys = ["user_name",
-                       "user_id",
-                       "group_id",
-                       "host_user",
-                       "xdg_data_home",
-                       "waydroid_data",
-                       "xdg_runtime_dir",
-                       "wayland_display",
-                       "pulse_runtime_path",
-                       "state",
-                       "lcd_density"]
+               "suspend_action",
+               "mount_overlays"]
 
 # Config file/commandline default values
 # $WORK gets replaced with the actual value for args.work (which may be
@@ -48,10 +37,14 @@ defaults = {
         "/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["overlay"] = defaults["work"] + "/overlay"
+defaults["overlay_rw"] = defaults["work"] + "/overlay_rw"
+defaults["overlay_work"] = defaults["work"] + "/overlay_work"
 defaults["data"] = defaults["work"] + "/data"
 defaults["lxc"] = defaults["work"] + "/lxc"
 defaults["host_perms"] = defaults["work"] + "/host-permissions"
@@ -61,6 +54,7 @@ session_defaults = {
     "user_id": str(os.getuid()),
     "group_id": str(os.getgid()),
     "host_user": os.path.expanduser("~"),
+    "pid": str(os.getpid()),
     "xdg_data_home": str(os.environ.get('XDG_DATA_HOME', os.path.expanduser("~") + "/.local/share")),
     "xdg_runtime_dir": str(os.environ.get('XDG_RUNTIME_DIR')),
     "wayland_display": str(os.environ.get('WAYLAND_DISPLAY')),